From beeb0b2cb79ae4e9061d12337d04865877c9d531 Mon Sep 17 00:00:00 2001 From: Juan Pablo Galeotti Date: Mon, 17 Nov 2025 13:50:21 -0300 Subject: [PATCH] Fix: Configure database initialization script for user-management subject in both external and embedded SUT controllers. --- .../demo2/EmbeddedEvoMasterController.java | 4 +- .../demo2/ExternalEvoMasterController.java | 5 +- .../src/main/resources/data.sql | 66 +++++++++++++++++++ 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 jdk_8_maven/em/external/rest/user-management/src/main/resources/data.sql diff --git a/jdk_8_maven/em/embedded/rest/user-management/src/main/java/em/embedded/com/giassi/microservice/demo2/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/rest/user-management/src/main/java/em/embedded/com/giassi/microservice/demo2/EmbeddedEvoMasterController.java index 99c7fcc2b..20f2b4e1d 100644 --- a/jdk_8_maven/em/embedded/rest/user-management/src/main/java/em/embedded/com/giassi/microservice/demo2/EmbeddedEvoMasterController.java +++ b/jdk_8_maven/em/embedded/rest/user-management/src/main/java/em/embedded/com/giassi/microservice/demo2/EmbeddedEvoMasterController.java @@ -49,6 +49,7 @@ public static void main(String[] args) { private ConfigurableApplicationContext ctx; private Connection sqlConnection; private List dbSpecification; + private static String INIT_DB_SCRIPT_PATH = "/data.sql"; public EmbeddedEvoMasterController() { this(40100); @@ -86,7 +87,8 @@ public String startSut() { throw new RuntimeException(e); } - dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection)); + dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection) + .withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH)); return "http://localhost:" + getSutPort(); } diff --git a/jdk_8_maven/em/external/rest/user-management/src/main/java/em/external/com/giassi/microservice/demo2/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/user-management/src/main/java/em/external/com/giassi/microservice/demo2/ExternalEvoMasterController.java index c73818652..d3df5a8ce 100644 --- a/jdk_8_maven/em/external/rest/user-management/src/main/java/em/external/com/giassi/microservice/demo2/ExternalEvoMasterController.java +++ b/jdk_8_maven/em/external/rest/user-management/src/main/java/em/external/com/giassi/microservice/demo2/ExternalEvoMasterController.java @@ -61,7 +61,7 @@ public static void main(String[] args) { private final int sutPort; private String jarLocation; private Connection sqlConnection; - //private String INIT_DB_SCRIPT_PATH = "/populateDB.sql"; + private static String INIT_DB_SCRIPT_PATH = "/data.sql"; private List dbSpecification; @@ -156,7 +156,8 @@ public void postStart() { try { sqlConnection = DriverManager.getConnection(dbUrl(), "root", "root"); - dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection)); + dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection) + .withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH)); } catch (Exception e) { throw new RuntimeException(e); diff --git a/jdk_8_maven/em/external/rest/user-management/src/main/resources/data.sql b/jdk_8_maven/em/external/rest/user-management/src/main/resources/data.sql new file mode 100644 index 000000000..d3b0d6341 --- /dev/null +++ b/jdk_8_maven/em/external/rest/user-management/src/main/resources/data.sql @@ -0,0 +1,66 @@ + +DELETE FROM permissions_roles; +DELETE FROM permissions; +DELETE FROM users_roles; +DELETE FROM roles; + +DELETE FROM contacts; +DELETE FROM addresses; +DELETE FROM users; + +INSERT INTO permissions(id, permission, note) VALUES (1, 'LOGIN', 'User Login'); +INSERT INTO permissions(id, permission, note) VALUES (2, 'VIEW_PROFILE', 'View user profile'); +INSERT INTO permissions(id, permission, note) VALUES (3, 'ADMIN_USER_DATA', 'Manage user data'); + +INSERT INTO permissions(id, permission, note, enabled) VALUES (4, 'ADMIN_STATISTICS', 'View statistical graphs', false); + +INSERT INTO roles(id, role) VALUES (1, 'USER'); +INSERT INTO roles(id, role) VALUES (2, 'ADMINISTRATOR'); + +INSERT INTO permissions_roles(permission_id, role_id) VALUES (1, 1); +INSERT INTO permissions_roles(permission_id, role_id) VALUES (2, 1); + +INSERT INTO permissions_roles(permission_id, role_id) VALUES (1, 2); +INSERT INTO permissions_roles(permission_id, role_id) VALUES (2, 2); +INSERT INTO permissions_roles(permission_id, role_id) VALUES (3, 2); + + +INSERT INTO users(id, username, password, name, surname, gender) VALUES (1, 'andrea', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Andrea', 'Test', 0); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (2, 'mario', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Mario', 'Rossi', 0); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (3, 'stefania', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Stefania', 'Verdi', 1); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (4, 'veronica', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Veronica', 'Gialli', 1); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (5, 'mark', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Mark', 'Green', 0); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (6, 'paul', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Paul', 'Ludwing', 0); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (7, 'jennifer', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Jennifer', 'Red', 0); +INSERT INTO users(id, username, password, name, surname, gender) VALUES (8, 'karina', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Karina', 'Yellow', 1); + +UPDATE users SET ENABLED = false WHERE id = 6; + +UPDATE users SET birth_date = '1977-08-14' WHERE id = 1; +UPDATE users SET secured = true WHERE id = 1; + +INSERT INTO users_roles(user_id, role_id) VALUES (1, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (1, 2); + +INSERT INTO users_roles(user_id, role_id) VALUES (2, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (3, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (4, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (5, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (6, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (7, 1); +INSERT INTO users_roles(user_id, role_id) VALUES (8, 1); + + + +INSERT INTO contacts(user_id, email, phone, note) VALUES (1, 'andrea.test@gmail.com', NULL, NULL); +INSERT INTO contacts(user_id, email, phone, note) VALUES (2, 'mario.rossi@gmail.com', NULL, 'test contact note on mario rossi'); +INSERT INTO contacts(user_id, email, phone, note) VALUES (3, 'stefania.verdi@gmail.com', NULL, NULL); +INSERT INTO contacts(user_id, email, phone, note) VALUES (4, 'veronica.gialli@gmail.com', NULL, NULL); +INSERT INTO contacts(user_id, email, phone, note) VALUES (5, 'mark.green@gmail.com', NULL, NULL); +INSERT INTO contacts(user_id, email, phone, note) VALUES (6, 'paul.ludwing@gmail.com', NULL, NULL); +INSERT INTO contacts(user_id, email, phone, note) VALUES (7, 'jennifer.red@gmail.com', NULL, NULL); +INSERT INTO contacts(user_id, email, phone, note) VALUES (8, 'karina.yellow@gmail.com', NULL, NULL); + +insert into addresses(user_id, address, address2, city, country, zip_code) values (2, 'Via Filzi 2', 'Borgo Teresiano', 'Florence', 'Italy', '50100'); +insert into addresses(user_id, address, address2, city, country, zip_code) values (7, 'Piazza Grande 12', 'Gran canal', 'Venice', 'Italy', '30100'); +insert into addresses(user_id, address, address2, city, country, zip_code) values (8, 'Via Roma 2', 'Borgo Teresiano', 'Trieste', 'Italy', '34100');