Merge pull request #18 from UnityFoundation-io/backend/updates-to-local-data-population

use flyway datasources to populate data and fix enum type

Author: HootDunk

UnityAuth/docker-compose.local.yml

@@ -12,7 +12,4 @@ services:
       MYSQL_ROOT_PASSWORD: test
       MYSQL_DATABASE: test
     ports:
-      - "13306:3306"
-    volumes:
-      - ./src/main/resources/db/migration:/docker-entrypoint-initdb.d
-      - ./local-data.sql:/docker-entrypoint-initdb.d/local-data.sql
+      - "13306:3306"

UnityAuth/src/main/resources/application-local.yml

@@ -21,7 +21,9 @@ datasources:
 flyway:
   datasources:
     default:
-      baseline-on-migrate: true
+      locations:
+        - classpath:db/migration
+        - classpath:local
 
 jwk:
   primary: "{\"p\":\"_OZyH1Mk3wR0oXw1C31t4kWOcaHFB6Njro1cYx52REnPiznn_JTtwvlAMpvV6LVCIZPgKMzdIEMY1gYs1LsO-5IFqWwegXmYJ0iKXbRrZshfWBCzRLK3QK5fER1le1XUBDhtDk7KIW_Xg-SZF4pf_LUEVKMnyUpspGI5F77jlJ8\",\"kty\":\"RSA\",\"q\":\"s9wvl7z8vkHQvo9xOUp-z0a2Z7LFBDil2uIjPh1FQzs34gFXH8dQPRox83TuN5d4KzdLPqQNQAfMXU9_KmxihNb_qDQahYugeELmcem04munxXqBdyZqWhWCy5YmujYqn44irwvoTbw6_RkMqjCmINPTPadptlPivsZ6RhKn8zk\",\"d\":\"ok3wmhOy8NZEHAotnFiH6ecFD6xf_9x33_fMRkqa3_KE8NZM7vmvNgElox2UvcP_2K5E7jOdL2XQdJCTIW3Qlj66yE2a84SYlbvxIc4hDrIog0XNt4FhavvshxxUIfDQo6Q8qXDR5v7nwt6SCopYC3t3KVRdJh08GzKoVxysd7afJjxXxx178gY29uMRqnwxFN1OGnWaiBr-xGKb1frJ6jOI1zvuuCaljZ4aZjc9vOR4y9ZmobgrzkMFnpDAmQZ7MWcVMyodRMOA2dEOckywPhg-dIVNiVIqzJqe5Yg1ilNookjwtqj2TpNU7Z9gPqzYB73PmQ2p5LMDheAPxcOmEQ\",\"e\":\"AQAB\",\"use\":\"sig\",\"kid\":\"e3be37177a7c42bcbadd7cc63715f216\",\"qi\":\"r--nAtaYPAgJq_8R1-kynpd53E17n-loDUgtVWBCx_RmdORX4Auilv1S83dD1mbcnYCbV_LmxiEjOiz-4gS_E0qVGqakAqQrO1hVUvJa_Y2uftDgwFmuJNGbpRU-K4Td_uUzdm48za8yJCgOdYsWp6PNMCcmQgiInzkR3XYV83I\",\"dp\":\"oQUcvmMSw8gzdin-IB2xW_MLecAVEgLu0dGBdD6N8HbKZQvub_xm0dAfFtnvvWXDAFwFyhR96i-uXX67Bos_Q9-6KSAE4E0KGmDucDESfPOw-QJREbl0QgOD1gLQfVGtVy6SCR0TR2zNXFWtP7bD3MNoSXdEOr5fI97CGSNaBWM\",\"alg\":\"RS256\",\"dq\":\"DM-WJDy10-dkMu6MpgQEXEcxHtnA5rgSODD7SaVUFaHWLSbjScQslu2SuUCO5y7GxG0_0spklzb2-356FE98BPI7a4Oqj_COEYLSXzLCS45XeN1s80utL5Vwp4eeYo0RJCQ_nDBA76iEmxp5qHWmn5f25-FQykfXUrdYZj1V8SE\",\"n\":\"sa6m2i-iNvj6ZSTdSHZaBrnv6DId4AqAXhOyl0yA5fNWYe6r51h24SXqk7DsGYHHh74ii74tP1lTpmy6RD67tCK-tbN-d6yc4Z6FfM8R83v2QZUfaAixgHGtw0n2toqsiHf6EloDV-B8q4GYyKDD6cLecoaIuTmMBTY3kts59U2t9W10YoLGsmFqLSz8qNF5HkahzB6_--2DiBfVGUKAXHC-SICGZCi-8efOetv6pt9vFiWEgwU_DgjRNYzLFt1SEmbGFUU4kbjQ7tNTMkHfzfwcT6qLt4kVKy2FNYsEMk24keWtCvW_RyO_fisZc0W9smX7WtYjEXhcAjDeqHgEZw\"}"

UnityAuth/local-data.sql renamed to UnityAuth/src/main/resources/local/afterMigrate.sql

@@ -8,15 +8,15 @@ DELETE FROM permission;
 DELETE FROM role;
 
 -- Create a tenant
-INSERT INTO tenant (id, name, description, status) VALUES(1, 'stl', 'St. Louis Metro Area', 'ENABLED');
+INSERT IGNORE INTO tenant (id, name, description, status) VALUES(1, 'stl', 'St. Louis Metro Area', 'ENABLED');
 -- Create Libre311 Service
-INSERT INTO service (id, name, description, status) VALUES(1, 'Libre311', 'Libre311', 'ENABLED');
+INSERT IGNORE INTO service (id, name, description, status) VALUES(1, 'Libre311', 'Libre311', 'ENABLED');
 
 -- Add Libre311 Service to stl tenant
-INSERT INTO tenant_service (tenant_id, service_id, status) VALUES(1, 1, 'ENABLED');
+INSERT IGNORE INTO tenant_service (tenant_id, service_id, status) VALUES(1, 1, 'ENABLED');
 
 
-INSERT INTO permission (id, name, description, scope)
+INSERT IGNORE INTO permission (id, name, description, scope)
 VALUES (1, 'AUTH_SERVICE_EDIT-SYSTEM', NULL, 'SYSTEM'),
        (2, 'AUTH_SERVICE_VIEW-SYSTEM', NULL, 'SYSTEM'),
        (3, 'AUTH_SERVICE_EDIT-TENANT', NULL, 'TENANT'),
@@ -35,7 +35,7 @@ VALUES (1, 'AUTH_SERVICE_EDIT-SYSTEM', NULL, 'SYSTEM'),
        (16, 'LIBRE311_REQUEST_VIEW-SUBTENANT', NULL, 'SUBTENANT');
 
 
-INSERT INTO role (id, name, description)
+INSERT IGNORE INTO role (id, name, description)
 VALUES (1, 'Unity Administrator', 'An administrator of the Unity Platform. A user with this role can perform any operation.'),
        (2, 'Tenant Administrator', 'An administrator for a tenant. A user with this role can perform any operation for the tenant.'),
        (3, 'Libre311 Administrator', 'An administrator for Libre311. A user with this role can perform any operation in Libre311 on behalf of their tenant.'),
@@ -45,7 +45,7 @@ VALUES (1, 'Unity Administrator', 'An administrator of the Unity Platform. A use
 
 
 -- Unity Administrator
-INSERT INTO role_permission (role_id, permission_id)
+INSERT IGNORE INTO role_permission (role_id, permission_id)
 VALUES (1, 1),  -- AUTH_SERVICE_EDIT-SYSTEM
        (1, 2),  -- AUTH_SERVICE_VIEW-SYSTEM
        (1, 5),  -- LIBRE311_ADMIN_EDIT-SYSTEM
@@ -54,7 +54,7 @@ VALUES (1, 1),  -- AUTH_SERVICE_EDIT-SYSTEM
        (1, 12); -- LIBRE311_REQUEST_VIEW-SYSTEM
 
 -- Tenant Administrator
-INSERT INTO role_permission (role_id, permission_id)
+INSERT IGNORE INTO role_permission (role_id, permission_id)
 VALUES (2, 3),  -- AUTH_SERVICE_EDIT-TENANT
        (2, 4),  -- AUTH_SERVICE_VIEW-TENANT
        (2, 7),  -- LIBRE311_ADMIN_EDIT-TENANT
@@ -63,85 +63,85 @@ VALUES (2, 3),  -- AUTH_SERVICE_EDIT-TENANT
        (2, 14); -- LIBRE311_REQUEST_VIEW-TENANT
 
 -- Libre311 Administrator
-INSERT INTO role_permission (role_id, permission_id)
+INSERT IGNORE INTO role_permission (role_id, permission_id)
 VALUES (3, 7),  -- LIBRE311_ADMIN_EDIT-TENANT
        (3, 8),  -- LIBRE311_ADMIN_VIEW-TENANT
        (3, 13), -- LIBRE311_REQUEST_EDIT-TENANT
        (3, 14); -- LIBRE311_REQUEST_VIEW-TENANT
 
 -- Libre311 Request Manager
-INSERT INTO role_permission (role_id, permission_id)
+INSERT IGNORE INTO role_permission (role_id, permission_id)
 VALUES (4, 13), -- LIBRE311_REQUEST_EDIT-TENANT
        (4, 14); -- LIBRE311_REQUEST_VIEW-TENANT
 
 -- Libre311 Jurisdiction Administrator
-INSERT INTO role_permission (role_id, permission_id)
+INSERT IGNORE INTO role_permission (role_id, permission_id)
 VALUES (5, 9),  -- LIBRE311_ADMIN_EDIT-SUBTENANT
        (5, 10), -- LIBRE311_ADMIN_VIEW-SUBTENANT
        (5, 15), -- LIBRE311_REQUEST_EDIT-SUBTENANT
        (5, 16); -- LIBRE311_REQUEST_VIEW-SUBTENANT
 
 -- Libre311 Jurisdiction Request Manager
-INSERT INTO role_permission (role_id, permission_id)
+INSERT IGNORE INTO role_permission (role_id, permission_id)
 VALUES (6, 15), -- LIBRE311_REQUEST_EDIT-SUBTENANT
        (6, 16); -- LIBRE311_REQUEST_VIEW-SUBTENANT
 
 
 -- Password for all the following accounts is 'test'
 -- Unity Administrator
-INSERT INTO user (id, email, password, status) VALUES
-    (1, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (1, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 -- Tenant Administrator
-INSERT INTO user (id, email, password, status) VALUES
-    (2, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (2, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 -- Libre311 Administrator
-INSERT INTO user (id, email, password, status) VALUES
-    (3, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (3, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 -- Libre311 Request Manager
-INSERT INTO user (id, email, password, status) VALUES
-    (4, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (4, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 -- Libre311 Jurisdiction Administrator
-INSERT INTO user (id, email, password, status) VALUES
-    (5, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (5, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 -- Libre311 Jurisdiction Request Manager
-INSERT INTO user (id, email, password, status) VALUES
-    (6, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (6, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 
 -- Stl sub-tenant admin
-INSERT INTO user (id, email, password, status) VALUES
-    (7, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'active');
+INSERT IGNORE INTO user (id, email, password, status) VALUES
+    (7, '[email protected]', '$2a$10$YJetsyoS.EzlVlb249w07uBR8uSqgtlqVH9Hl7bsHtvvwdKAhJp82', 'ENABLED');
 
 -- Unity Administrator
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 1, 1);
 
 -- Tenant Administrator
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 2, 2);
 
 -- Libre311 Administrator
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 3, 3);
 
 -- Libre311 Request Manager
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 4, 4);
 
 -- Libre311 Jurisdiction Administrator
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 5, 5);
 
 -- Libre311 Jurisdiction Request Manager
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 6, 6);
 
 
 -- Stl sub-tenant admin
-INSERT INTO user_role (tenant_id, user_id, role_id) VALUES
+INSERT IGNORE INTO user_role (tenant_id, user_id, role_id) VALUES
     (1, 7, 5);