diff --git a/prod.sh b/prod.sh index d92700fca987b7365e36e6ef3b0ff6b02b3c17d7..d93a8630c7f27526c3ce37d8d766b089793e0113 100755 --- a/prod.sh +++ b/prod.sh @@ -9,7 +9,7 @@ export SPRING_PROFILES_ACTIVE=production; export SECURITY_ENABLED=true; export PGHOST='localhost'; export PGPORT='5432'; -export PG_DATABASE=common; +export PG_DATABASE=common_slim; export APP_DB_ADMIN_PASSWORD=''; export PG_USER=${USER}; export APP_DB_RW_PASSWORD=''; diff --git a/src/main/resources/application-development.properties b/src/main/resources/application-development.properties index 4d4955037864adec09e6e139c19c1b8dcb35563e..f1fb1b65a7aa73aa383c9a41a0756b74bae6ea1f 100644 --- a/src/main/resources/application-development.properties +++ b/src/main/resources/application-development.properties @@ -12,24 +12,12 @@ debug=true logging.level.liquibase=INFO -# Puckboard URL for local testing -puckboard-url=http://localhost:8099/puckboard-api/v1 - # Used to toggle Spring Security configuration on and off security.enabled=false # allowed origins origins = http://localhost:3000,http://localhost:8080 -#app source definition file -appsource.definition-file= - -#disable saving metrics to database -metrics.save.enabled=false - -#disable metric filter -metrics.gateway.count=false - #enable viewing metrics - allows list of metrics management.endpoint.metrics.enabled=true management.endpoints.web.exposure.include=health,logfile,metrics,httptrace diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties index c63266aa78b8c8b2071f8c3522650386eb3af32d..d89e349d0b7e55b8bd02496463f2c926c42fda26 100644 --- a/src/main/resources/application-production.properties +++ b/src/main/resources/application-production.properties @@ -1,4 +1,4 @@ spring.liquibase.user=${PG_USER} spring.liquibase.password=${APP_DB_ADMIN_PASSWORD} spring.liquibase.contexts=production -spring.datasource.url=jdbc:postgresql://${PGHOST}:${PGPORT}/${PG_DATABASE}?sslmode=require&ssl=true \ No newline at end of file +spring.datasource.url=jdbc:postgresql://${PGHOST}:${PGPORT}/${PG_DATABASE} \ No newline at end of file diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 130670254dd4a8b2bfe6fed9c80084b5c43bba04..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -1,10 +0,0 @@ -appsource.definition-file=/appsourceapis/appSourceConfig.test.json - -#disable saving metrics to database -metrics.save.enabled=false - -#disable metric filter -metrics.gateway.count=false - -#disable caching -caching.enabled=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 08a9644f0c5ab5b604b9a38ee7fcf13c34942a8d..e665f069a55d5103039464bd1e40911b955c60e6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -77,9 +77,3 @@ springdoc.api-docs.groups.enabled=true # Name token used to identify common api app common-api-app-name=istio-system - -# Entity Field Authorization -efa-enabled=true - -# Health ping rate for app sources (milliseconds) -app-source-ping-rate-millis=60000 \ No newline at end of file diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.001.xml b/src/main/resources/db/changelog/diff-changelog-1.00.001.xml deleted file mode 100644 index fb6b0aad291d40905c6b7543a5df529f4b8dd071..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.001.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.002.xml b/src/main/resources/db/changelog/diff-changelog-1.00.002.xml deleted file mode 100644 index db443da29850986116b4587bc2b673d87860ccb6..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.002.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.003.xml b/src/main/resources/db/changelog/diff-changelog-1.00.003.xml deleted file mode 100644 index be66f44763d77fb8ec3afa01fb99a4e02e494e69..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.003.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.004.xml b/src/main/resources/db/changelog/diff-changelog-1.00.004.xml deleted file mode 100644 index 10869d59d8fa830b22f7e6ce638b9e738fc2803e..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.004.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.005.xml b/src/main/resources/db/changelog/diff-changelog-1.00.005.xml deleted file mode 100644 index d387612f2746df85cea406063f97990d2be96678..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.005.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.006.xml b/src/main/resources/db/changelog/diff-changelog-1.00.006.xml deleted file mode 100644 index 6f8cd058f8b7c9a682ac86c036a656e29db0ac6d..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.006.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.007.xml b/src/main/resources/db/changelog/diff-changelog-1.00.007.xml deleted file mode 100644 index 13080016481446663cd7555adbf50fc32861336c..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.007.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - UPDATE airman - SET rank = ( - SELECT converted FROM ( - SELECT title, - CASE - WHEN UPPER(title) = 'AB' then 'AB' - WHEN UPPER(title) = 'AMN' then 'AMN' - WHEN UPPER(title) = 'A1C' then 'A1C' - WHEN UPPER(title) = 'SRA' then 'SRA' - WHEN UPPER(title) = 'SSGT' then 'SSGT' - WHEN UPPER(title) = 'TSGT' then 'TSGT' - WHEN UPPER(title) = 'MSGT' then 'MSGT' - WHEN UPPER(title) = 'SMGT' then 'SMGT' - WHEN UPPER(title) = 'CMSGT' then 'CMSGT' - WHEN UPPER(title) = 'CCMSGT' then 'CCMSGT' - WHEN UPPER(title) = 'CMSAF' then 'CMSAF' - WHEN UPPER(title) = '2LT' then '2LT' - WHEN UPPER(title) = '1LT' then '1LT' - WHEN UPPER(title) = 'CAPT' then 'CAPT' - WHEN UPPER(title) = 'MAJ' then 'MAJ' - WHEN UPPER(title) = 'LTCOL' then 'LTCOL' - WHEN UPPER(title) = 'COL' then 'COL' - WHEN UPPER(title) = 'BG' then 'BG' - WHEN UPPER(title) = 'MG' then 'MG' - WHEN UPPER(title) = 'LTG' then 'LTG' - WHEN UPPER(title) = 'GEN' then 'GEN' - WHEN UPPER(title) = 'CIV' then 'CIV' - WHEN UPPER(title) = 'CTR' then 'CTR' - WHEN UPPER(title) = 'SES' then 'SES' - ELSE 'UNKNOWN' - END AS converted - FROM person WHERE 'person.id' = 'airman.id' - ) AS title); - - - \ No newline at end of file diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.008.xml b/src/main/resources/db/changelog/diff-changelog-1.00.008.xml deleted file mode 100644 index 3c7bd6a10c8e98ac74edd19c5ac9ae16ca9c8f3c..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.008.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.009.xml b/src/main/resources/db/changelog/diff-changelog-1.00.009.xml deleted file mode 100644 index aa0fb9ae8ca9f048390ae82865fb006e775d39de..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.009.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - SELECT COUNT(*) FROM privilege WHERE name='READ'; - - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='WRITE'; - - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='DASHBOARD_ADMIN'; - - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='DASHBOARD_USER'; - - - - - - - - - - - - SELECT COUNT(*) FROM app_client_user WHERE name='guardianangel'; - - - - - - - - - - - - - - SELECT COUNT(*) FROM app_client_user WHERE name='guardianangel'; - - - - - - - - - - - - - SELECT COUNT(*) FROM app_client_user WHERE name='guardianangel'; - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.010.xml b/src/main/resources/db/changelog/diff-changelog-1.00.010.xml deleted file mode 100644 index af9e0a341c49cbb246551c25a0883c2ee64b196c..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.010.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.011.xml b/src/main/resources/db/changelog/diff-changelog-1.00.011.xml deleted file mode 100644 index f77abebf1a52e6894adc6ea957caf39279418584..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.011.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.012.xml b/src/main/resources/db/changelog/diff-changelog-1.00.012.xml deleted file mode 100644 index 23378c0fe82b416c6f63aa1038f3ef271e79f966..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.012.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.013.xml b/src/main/resources/db/changelog/diff-changelog-1.00.013.xml deleted file mode 100644 index df17c7d401ea734bb649dc8af84332e28becb612..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.013.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='SCRATCH_WRITE'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='SCRATCH_READ'; - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.014.xml b/src/main/resources/db/changelog/diff-changelog-1.00.014.xml deleted file mode 100644 index b2a19ad3260f3837c6a8f91d59b0124784c29ca9..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.014.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - SELECT COUNT(*) FROM privilege WHERE name='SCRATCH_ADMIN'; - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.015.xml b/src/main/resources/db/changelog/diff-changelog-1.00.015.xml deleted file mode 100644 index 43cfa40e73e2ddf63450be3cf7a0be34e002f485..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.015.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.016.xml b/src/main/resources/db/changelog/diff-changelog-1.00.016.xml deleted file mode 100644 index 489653ca9553b4d8c84546169564bb722574d313..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.016.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - SELECT COUNT(*) FROM dashboard_user WHERE email='bb@gmail.com'; - - - - - - - - - - - - - - - - - - - - SELECT COUNT(*) FROM dashboard_user WHERE email='jj@gmail.com'; - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.017.xml b/src/main/resources/db/changelog/diff-changelog-1.00.017.xml deleted file mode 100644 index cfcc436ee5fcb155b041654b8c6cda1b48729999..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.017.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.018.xml b/src/main/resources/db/changelog/diff-changelog-1.00.018.xml deleted file mode 100644 index 54baa4dbe3f39330c51f7f87240e3b402f526c70..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.018.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.019.xml b/src/main/resources/db/changelog/diff-changelog-1.00.019.xml deleted file mode 100644 index 8f0c38b04e7ff7f29e6011fcc33ed5e8b61a8f92..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.019.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.020.xml b/src/main/resources/db/changelog/diff-changelog-1.00.020.xml deleted file mode 100644 index bbc692af09623b45203a06495e9fdf756eb67920..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.020.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.021.xml b/src/main/resources/db/changelog/diff-changelog-1.00.021.xml deleted file mode 100644 index d267f10b75f18f2b943ff0a0713017ef899656bd..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.021.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT COUNT(*) - FROM pg_constraint - WHERE conname='UK100019-12' - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.022.xml b/src/main/resources/db/changelog/diff-changelog-1.00.022.xml deleted file mode 100644 index 02c64cd46b668f8ae8ebc91c50b64d21c5263ea8..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.022.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='APP_SOURCE_ADMIN'; - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.023.xml b/src/main/resources/db/changelog/diff-changelog-1.00.023.xml deleted file mode 100644 index f92118c49c68d8f887b15b575e743d1f7eaec292..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.023.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.024.xml b/src/main/resources/db/changelog/diff-changelog-1.00.024.xml deleted file mode 100644 index 2d233c2a13dadce4ecfccfd7a64f62a797c58b16..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.024.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.025.xml b/src/main/resources/db/changelog/diff-changelog-1.00.025.xml deleted file mode 100644 index 5b0f647aa4c3aa1cf6ec92847dbb0e8266c4baa7..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.025.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.026.xml b/src/main/resources/db/changelog/diff-changelog-1.00.026.xml deleted file mode 100644 index 48862c168f55fc0f7c35f5d2fa99357108de99ad..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.026.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.027.xml b/src/main/resources/db/changelog/diff-changelog-1.00.027.xml deleted file mode 100644 index a922c117ec325841c4d4622d25f400871f284601..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.027.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - SELECT COUNT(*) FROM rank WHERE name='Unknown'; - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.028.xml b/src/main/resources/db/changelog/diff-changelog-1.00.028.xml deleted file mode 100644 index faf652854487d7edba73124580d4ab8787e1db84..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.028.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.029.xml b/src/main/resources/db/changelog/diff-changelog-1.00.029.xml deleted file mode 100644 index 1c47422a9aa364fe5cebd1d0cfcc07830a9834c7..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.029.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.030.xml b/src/main/resources/db/changelog/diff-changelog-1.00.030.xml deleted file mode 100644 index f2ac96a312a60d15ec30827e7fd37917afc1a299..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.030.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.031.xml b/src/main/resources/db/changelog/diff-changelog-1.00.031.xml deleted file mode 100644 index a7088589c5ee242e274cc1478c436223cd8ac830..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.031.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='APP_CLIENT_DEVELOPER'; - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.032.xml b/src/main/resources/db/changelog/diff-changelog-1.00.032.xml deleted file mode 100644 index e98110f409c1eb37153817e728303927d186a3bf..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.032.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - DELETE FROM app_endpoint_privs WHERE app_client_user_id = app_source_id; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE app SET available_as_app_source = true, name_as_lower = LOWER(name); - - - - - - INSERT INTO app (id, name, name_as_lower) SELECT id, name, name_as_lower FROM app_client_user WHERE name_as_lower NOT IN (SELECT name_as_lower FROM app); - - - - - - - - - - UPDATE app SET available_as_app_client = true WHERE name_as_lower IN (SELECT name_as_lower from app_client_user); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT COUNT(*) - FROM pg_constraint - WHERE conname='appClientUser_nameAsLower_key' - - - - - - - - - - - UPDATE app_app_client_developers app_client_dev SET app_client_user_id = (SELECT app.id FROM app app JOIN app_client_user client_user ON app.name_as_lower = client_user.name_as_lower WHERE client_user.id = app_client_dev.app_client_user_id); - - - - - - - - UPDATE app_privileges app_priv SET app_client_user_id = (SELECT app.id FROM app app JOIN app_client_user client_user ON app.name_as_lower = client_user.name_as_lower WHERE client_user.id = app_priv.app_client_user_id); - - - - - - - - UPDATE app_endpoint_privs app_priv SET app_client_user_id = (SELECT app.id FROM app app JOIN app_client_user client_user ON app.name_as_lower = client_user.name_as_lower WHERE client_user.id = app_priv.app_client_user_id); - - - - - - - - UPDATE meter_value meter_val SET app_client_user_id = (SELECT app.id FROM app app JOIN app_client_user client_user ON app.name_as_lower = client_user.name_as_lower WHERE client_user.id = meter_val.app_client_user_id); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.033.xml b/src/main/resources/db/changelog/diff-changelog-1.00.033.xml deleted file mode 100644 index 0fb53848f29b5ba79fc4ea28cfa402d2617c60be..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.033.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.034.xml b/src/main/resources/db/changelog/diff-changelog-1.00.034.xml deleted file mode 100644 index e13cc5e11c9580801fdb2807307920083b0f829e..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.034.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.035.xml b/src/main/resources/db/changelog/diff-changelog-1.00.035.xml deleted file mode 100644 index fe3aac06a95110b479c45bfda5a77d75398e6344..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.035.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.036.xml b/src/main/resources/db/changelog/diff-changelog-1.00.036.xml deleted file mode 100644 index d37005a75e8fd59a7fd40ec749b6b64b01a35830..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.036.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - SELECT COUNT(*) FROM privilege WHERE name='PERSON_CREATE'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='ORGANIZATION_CREATE'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='PERSON_DELETE'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='ORGANIZATION_DELETE'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='PERSON_READ'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='ORGANIZATION_READ'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='PERSON_EDIT'; - - - - - - - - - - - SELECT COUNT(*) FROM privilege WHERE name='ORGANIZATION_EDIT'; - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.037.xml b/src/main/resources/db/changelog/diff-changelog-1.00.037.xml deleted file mode 100644 index 289cbf8464bce97ba039fe7c82e5ecf8e30a224a..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.037.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.038.xml b/src/main/resources/db/changelog/diff-changelog-1.00.038.xml deleted file mode 100644 index d8c8a8696cf7c375558c7e68905050535accc5c6..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.038.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.039.xml b/src/main/resources/db/changelog/diff-changelog-1.00.039.xml deleted file mode 100644 index 804098fa2f69e88140996a69c560b283661b8ff9..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.039.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - SELECT COUNT(TRUE) - FROM information_schema.columns - WHERE table_schema='public' AND table_name='app' AND column_name='throttle_request_count'; - - - - SELECT COUNT(TRUE) - FROM information_schema.columns - WHERE table_schema='public' AND table_name='app' AND column_name='throttle_enabled'; - - - - - - - - - - - - - - diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.040.xml b/src/main/resources/db/changelog/diff-changelog-1.00.040.xml deleted file mode 100644 index 6506aa37a0bea3ffb8aa2692299ea70a625e27d1..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.040.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/db/changelog/diff-changelog-1.00.041.xml b/src/main/resources/db/changelog/diff-changelog-1.00.041.xml deleted file mode 100644 index 2dd04e49fb710dd57793b12c4ce97d94cb498b6e..0000000000000000000000000000000000000000 --- a/src/main/resources/db/changelog/diff-changelog-1.00.041.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/db/seed.1.0.40/ranks.csv b/src/main/resources/db/ranks/ranks.csv similarity index 82% rename from src/main/resources/db/seed.1.0.40/ranks.csv rename to src/main/resources/db/ranks/ranks.csv index faddb7fc273f882396ab28ea6cd31322655231b9..48062da3a8dd8c60f10d8a5803d47b75f8c301be 100644 --- a/src/main/resources/db/seed.1.0.40/ranks.csv +++ b/src/main/resources/db/ranks/ranks.csv @@ -1,4 +1,30 @@ id,branch_type,pay_grade,abbreviation,name +369cd9d4-6e43-438b-a2be-82b5763e537e,OTHER,GS,CIV,Civilian +bf73117d-1573-4933-bf43-3e2c429421e1,USAF,CTR,CTR,Contractor +2f231ead-bb4c-441c-9252-dfb668d4bc32,USAF,GS,CIV,Civilian +8e963a10-0731-47c1-aee6-2ee1284dbccd,USAF,SES,SES,Senior Executive Service +2be6c620-d0b3-444c-8ec6-7d85a998dddd,USAF,E-1,AB,Airman Basic +62841316-03b3-4ae4-9515-85eded0c42f5,USAF,E-2,Amn,Airman +61596024-5843-4f02-80ca-df608fc1854b,USAF,E-3,A1C,Airman First Class +3940a64a-0a60-4e55-81a6-bfc3eb63bbc4,USAF,E-4,SrA,Senior Airman +62a47eb7-28f2-4c15-8c96-b586713b0b08,USAF,E-5,SSgt,Staff Sergeant +ed83d825-0337-4a83-9620-29a4406f7bd4,USAF,E-6,TSgt,Technical Sergeant +9d4a153c-b6be-4153-999d-8357c55f758d,USAF,E-7,MSgt,Master Sergeant +81563da4-3b6e-4456-b67b-a1c79f5af4c8,USAF,E-8,SMSgt,Senior Master Sergeant +cbd46efa-b4b3-41f7-826d-f96af6827436,USAF,E-9,CMSgt,Chief Master Sergeant +fb4e5b1e-3db0-4936-91f2-e30d7708fcac,USAF,E-9,CCM,Command Chief Master Sergeant +5cc2b9d8-6481-428e-a9c3-49008eb8b1e8,USAF,E-9,CMSAF,Chief Master Sergeant Of The Air Force +e50aae34-c948-45e1-8df8-5198c8e73d0e,USAF,O-1,2nd Lt,Second Lieutenant +4331df98-b4f4-4ad2-a967-d495a1f8f4fe,USAF,O-2,1st Lt,First Lieutenant +cb349131-c2c9-4abb-87a7-e43efa3bc5b8,USAF,O-3,Capt,Captain +2d473530-9f36-40d6-b214-4d76d3cc149b,USAF,O-4,Maj,Major +cb52deb6-ccf6-4754-b538-807ad6b44f7c,USAF,O-5,Lt Col,Lieutenant Colonel +fe6a1f74-2209-4af0-a852-67049ee08439,USAF,O-6,Col,Colonel +e2614c98-43f8-4041-9af6-b09e5887b903,USAF,O-7,Brig Gen,Brigadier General +82bd67d1-0a69-4bd1-b775-b7c86370bc5c,USAF,O-8,Maj Gen,Major General +afc05741-9400-47c2-aad6-87bce0a8f847,USAF,O-9,Lt Gen,Lieutenant General +205bf800-3c6a-464c-a1b5-e7a44f8d8549,USAF,O-10,Gen,General +e3738af7-92b5-4a78-adff-7c09e456a7a1,USAF,O-10,GAF,General of the Air Force 9f7a2276-df22-4773-ba17-42ed2f4ccde8,USA,E-1,PV1,Private 218e8ff1-cccf-4422-a051-2d4c8fa9f676,USA,E-2,PV2,Private 19c6d9bc-a43b-493c-ac46-ea3efaa439da,USA,E-3,PFC,Private First Class diff --git a/src/main/resources/db/seed.1.0.10/ranks.csv b/src/main/resources/db/seed.1.0.10/ranks.csv deleted file mode 100644 index 9296f83ce9490a5f33a6cd945797435c72758cd1..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed.1.0.10/ranks.csv +++ /dev/null @@ -1,27 +0,0 @@ -id,branch_type,pay_grade,abbreviation,name -369cd9d4-6e43-438b-a2be-82b5763e537e,OTHER,GS,CIV,Civilian -bf73117d-1573-4933-bf43-3e2c429421e1,USAF,CTR,CTR,Contractor -2f231ead-bb4c-441c-9252-dfb668d4bc32,USAF,GS,CIV,Civilian -8e963a10-0731-47c1-aee6-2ee1284dbccd,USAF,SES,SES,Senior Executive Service -2be6c620-d0b3-444c-8ec6-7d85a998dddd,USAF,E-1,AB,Airman Basic -62841316-03b3-4ae4-9515-85eded0c42f5,USAF,E-2,Amn,Airman -61596024-5843-4f02-80ca-df608fc1854b,USAF,E-3,A1C,Airman First Class -3940a64a-0a60-4e55-81a6-bfc3eb63bbc4,USAF,E-4,SrA,Senior Airman -62a47eb7-28f2-4c15-8c96-b586713b0b08,USAF,E-5,SSgt,Staff Sergeant -ed83d825-0337-4a83-9620-29a4406f7bd4,USAF,E-6,TSgt,Technical Sergeant -9d4a153c-b6be-4153-999d-8357c55f758d,USAF,E-7,MSgt,Master Sergeant -81563da4-3b6e-4456-b67b-a1c79f5af4c8,USAF,E-8,SMSgt,Senior Master Sergeant -cbd46efa-b4b3-41f7-826d-f96af6827436,USAF,E-9,CMSgt,Chief Master Sergeant -fb4e5b1e-3db0-4936-91f2-e30d7708fcac,USAF,E-9,CCM,Command Chief Master Sergeant -5cc2b9d8-6481-428e-a9c3-49008eb8b1e8,USAF,E-9,CMSAF,Chief Master Sergeant Of The Air Force -e50aae34-c948-45e1-8df8-5198c8e73d0e,USAF,O-1,2nd Lt,Second Lieutenant -4331df98-b4f4-4ad2-a967-d495a1f8f4fe,USAF,O-2,1st Lt,First Lieutenant -cb349131-c2c9-4abb-87a7-e43efa3bc5b8,USAF,O-3,Capt,Captain -2d473530-9f36-40d6-b214-4d76d3cc149b,USAF,O-4,Maj,Major -cb52deb6-ccf6-4754-b538-807ad6b44f7c,USAF,O-5,Lt Col,Lieutenant Colonel -fe6a1f74-2209-4af0-a852-67049ee08439,USAF,O-6,Col,Colonel -e2614c98-43f8-4041-9af6-b09e5887b903,USAF,O-7,Brig Gen,Brigadier General -82bd67d1-0a69-4bd1-b775-b7c86370bc5c,USAF,O-8,Maj Gen,Major General -afc05741-9400-47c2-aad6-87bce0a8f847,USAF,O-9,Lt Gen,Lieutenant General -205bf800-3c6a-464c-a1b5-e7a44f8d8549,USAF,O-10,Gen,General -e3738af7-92b5-4a78-adff-7c09e456a7a1,USAF,O-10,GAF,General of the Air Force \ No newline at end of file diff --git a/src/main/resources/db/seed/1.0.2/airman.csv b/src/main/resources/db/seed/1.0.2/airman.csv deleted file mode 100755 index 65aa929fe08030eadbc12a11ccb6bc8624dd0245..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed/1.0.2/airman.csv +++ /dev/null @@ -1,4 +0,0 @@ -id,afsc,dodid,ets_date,pt_date,admin,approved,deros,dor,duty_phone,duty_title,flt_chief,go81,gp,imds,man_number,phone,squadron,unit,wc,wing -bae5e52c-bfc4-49c4-a383-448f1ddb3636,1N371G,XXX01,2020-11-06 00:00:00,2020-02-15 0:00:00,true,false,2020-11-06 00:00:00,2018-05-001 00:00:00,123-456-7890,NCOIC Software Development,MSgt Gardiner,unsure,692 ISRG,what,this,112-345-6789,324 IS,324 IS,uh,480 ISRW -ba941af3-9d17-4cf9-816a-04b22609cd30,1N471,XXX02,NULL,NULL,true,false,NULL,2012-05-001 00:00:00,133-456-7890,Superintendent Combatives Training,SMSgt Dudebro,unsure,691 ISRG,what,this,102-345-6889,322 IS,322 IS,uh,489 ISRW -67822f21-6cb5-4381-a433-8a2d48e1b9d9,1N091,XXX03,2010-11-06 00:00:00,2010-11-06 00:00:00,true,false,2010-11-06 00:00:00,2012-05-001 00:00:00,999-999-9999,Superintendent Operations,CMSgt Chadbrochill,unsure,691 ISRG,what,this,999-999-9999,322 IS,322 IS,uh,489 ISRW \ No newline at end of file diff --git a/src/main/resources/db/seed/1.0.2/organization.csv b/src/main/resources/db/seed/1.0.2/organization.csv deleted file mode 100755 index d8ad415bf2e1134cab8b9856107e5678184366d2..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed/1.0.2/organization.csv +++ /dev/null @@ -1,6 +0,0 @@ -id,name,leader_id,parent_organization_id,name_as_lower -43c164c4-c758-4e1b-a5f6-56eeb8a55aa1,TRON,4af78925-81f6-47d6-a54f-d1f2abff3296,NULL,tron -bca27cc7-e0be-4ebb-ba74-2a3949553a4d,Common API Team,f27c55f1-6458-4d6f-83f0-2026aedad175,43c164c4-c758-4e1b-a5f6-56eeb8a55aa1,common api team -e7551efc-9e31-42b4-8be2-2603336f825b,Random Team,NULL,NULL,random team -9dd41381-ecf0-4566-b1da-de750a9ae600,8 IS,NULL,NULL,8 is -cd09bd0f-88bf-4a67-ac28-99a22f97c6b9,324 IS,NULL,NULL,324 is \ No newline at end of file diff --git a/src/main/resources/db/seed/1.0.2/organization_members.csv b/src/main/resources/db/seed/1.0.2/organization_members.csv deleted file mode 100755 index 8143c5225bc40b5f23260a62ad5ee729d614cd67..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed/1.0.2/organization_members.csv +++ /dev/null @@ -1,5 +0,0 @@ -organization_id,members_id -43c164c4-c758-4e1b-a5f6-56eeb8a55aa1,4af78925-81f6-47d6-a54f-d1f2abff3296 -43c164c4-c758-4e1b-a5f6-56eeb8a55aa1,f27c55f1-6458-4d6f-83f0-2026aedad175 -bca27cc7-e0be-4ebb-ba74-2a3949553a4d,ba941af3-9d17-4cf9-816a-04b22609cd30 -e7551efc-9e31-42b4-8be2-2603336f825b,67822f21-6cb5-4381-a433-8a2d48e1b9d9 \ No newline at end of file diff --git a/src/main/resources/db/seed/1.0.2/organization_subordinate_organizations.csv b/src/main/resources/db/seed/1.0.2/organization_subordinate_organizations.csv deleted file mode 100755 index 24e6e96c208adbaddf75abd0064be06688b30abb..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed/1.0.2/organization_subordinate_organizations.csv +++ /dev/null @@ -1,2 +0,0 @@ -organization_id,subordinate_organizations_id -43c164c4-c758-4e1b-a5f6-56eeb8a55aa1,bca27cc7-e0be-4ebb-ba74-2a3949553a4d \ No newline at end of file diff --git a/src/main/resources/db/seed/1.0.2/person.csv b/src/main/resources/db/seed/1.0.2/person.csv deleted file mode 100755 index ca21e57702328158c333a5179dd7d16004d21245..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed/1.0.2/person.csv +++ /dev/null @@ -1,7 +0,0 @@ -id,first_name,middle_name,last_name,title,email -4af78925-81f6-47d6-a54f-d1f2abff3296,bob,bobbert,bobbington,Mr.,bob@fakemail.com -f27c55f1-6458-4d6f-83f0-2026aedad175,roberta,NULL,bobbington,Mrs.,roberta@fakemail.com -3b699474-d17c-445b-bcde-3e3809980330,william,bill,billiam,Mr.,william@fakemail.com -bae5e52c-bfc4-49c4-a383-448f1ddb3636,Brandon,Michael,Swenson,SSgt,brandon.swenson.2@us.af.mil -ba941af3-9d17-4cf9-816a-04b22609cd30,Jonathan,NULL,Joestar,MSgt,jo@jo.com -67822f21-6cb5-4381-a433-8a2d48e1b9d9,DIO,NULL,Brando,Capt,dio@brando.com \ No newline at end of file diff --git a/src/main/resources/db/seed/1.0.2/squadron.csv b/src/main/resources/db/seed/1.0.2/squadron.csv deleted file mode 100755 index d3fb828090e0f534c85bcf8a59fd52bea024109b..0000000000000000000000000000000000000000 --- a/src/main/resources/db/seed/1.0.2/squadron.csv +++ /dev/null @@ -1,3 +0,0 @@ -id,base_name,major_command,chief_id,operations_director_id -9dd41381-ecf0-4566-b1da-de750a9ae600,JBPHH,ACC,ba941af3-9d17-4cf9-816a-04b22609cd30,NULL -cd09bd0f-88bf-4a67-ac28-99a22f97c6b9,JBPHH,ACC,NULL,67822f21-6cb5-4381-a433-8a2d48e1b9d9 \ No newline at end of file