Skip to content

Commit 8853ed7

Browse files
authored
Merge pull request #161 from WebFuzzing/fix-missing-withInitSqlOnResourcePath
Fix: Configure database initialization script for user-management
2 parents 7a71894 + beeb0b2 commit 8853ed7

File tree

3 files changed

+72
-3
lines changed

3 files changed

+72
-3
lines changed

jdk_8_maven/em/embedded/rest/user-management/src/main/java/em/embedded/com/giassi/microservice/demo2/EmbeddedEvoMasterController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public static void main(String[] args) {
4949
private ConfigurableApplicationContext ctx;
5050
private Connection sqlConnection;
5151
private List<DbSpecification> dbSpecification;
52+
private static String INIT_DB_SCRIPT_PATH = "/data.sql";
5253

5354
public EmbeddedEvoMasterController() {
5455
this(40100);
@@ -86,7 +87,8 @@ public String startSut() {
8687
throw new RuntimeException(e);
8788
}
8889

89-
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection));
90+
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection)
91+
.withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
9092

9193
return "http://localhost:" + getSutPort();
9294
}

jdk_8_maven/em/external/rest/user-management/src/main/java/em/external/com/giassi/microservice/demo2/ExternalEvoMasterController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void main(String[] args) {
6161
private final int sutPort;
6262
private String jarLocation;
6363
private Connection sqlConnection;
64-
//private String INIT_DB_SCRIPT_PATH = "/populateDB.sql";
64+
private static String INIT_DB_SCRIPT_PATH = "/data.sql";
6565

6666
private List<DbSpecification> dbSpecification;
6767

@@ -156,7 +156,8 @@ public void postStart() {
156156
try {
157157
sqlConnection = DriverManager.getConnection(dbUrl(), "root", "root");
158158

159-
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection));
159+
dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.MYSQL,sqlConnection)
160+
.withInitSqlOnResourcePath(INIT_DB_SCRIPT_PATH));
160161

161162
} catch (Exception e) {
162163
throw new RuntimeException(e);
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2+
DELETE FROM permissions_roles;
3+
DELETE FROM permissions;
4+
DELETE FROM users_roles;
5+
DELETE FROM roles;
6+
7+
DELETE FROM contacts;
8+
DELETE FROM addresses;
9+
DELETE FROM users;
10+
11+
INSERT INTO permissions(id, permission, note) VALUES (1, 'LOGIN', 'User Login');
12+
INSERT INTO permissions(id, permission, note) VALUES (2, 'VIEW_PROFILE', 'View user profile');
13+
INSERT INTO permissions(id, permission, note) VALUES (3, 'ADMIN_USER_DATA', 'Manage user data');
14+
15+
INSERT INTO permissions(id, permission, note, enabled) VALUES (4, 'ADMIN_STATISTICS', 'View statistical graphs', false);
16+
17+
INSERT INTO roles(id, role) VALUES (1, 'USER');
18+
INSERT INTO roles(id, role) VALUES (2, 'ADMINISTRATOR');
19+
20+
INSERT INTO permissions_roles(permission_id, role_id) VALUES (1, 1);
21+
INSERT INTO permissions_roles(permission_id, role_id) VALUES (2, 1);
22+
23+
INSERT INTO permissions_roles(permission_id, role_id) VALUES (1, 2);
24+
INSERT INTO permissions_roles(permission_id, role_id) VALUES (2, 2);
25+
INSERT INTO permissions_roles(permission_id, role_id) VALUES (3, 2);
26+
27+
28+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (1, 'andrea', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Andrea', 'Test', 0);
29+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (2, 'mario', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Mario', 'Rossi', 0);
30+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (3, 'stefania', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Stefania', 'Verdi', 1);
31+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (4, 'veronica', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Veronica', 'Gialli', 1);
32+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (5, 'mark', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Mark', 'Green', 0);
33+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (6, 'paul', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Paul', 'Ludwing', 0);
34+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (7, 'jennifer', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Jennifer', 'Red', 0);
35+
INSERT INTO users(id, username, password, name, surname, gender) VALUES (8, 'karina', '1d/NZaEqNgtEomytAPrwm/+QjmbudLg33oeEk77Xh88=', 'Karina', 'Yellow', 1);
36+
37+
UPDATE users SET ENABLED = false WHERE id = 6;
38+
39+
UPDATE users SET birth_date = '1977-08-14' WHERE id = 1;
40+
UPDATE users SET secured = true WHERE id = 1;
41+
42+
INSERT INTO users_roles(user_id, role_id) VALUES (1, 1);
43+
INSERT INTO users_roles(user_id, role_id) VALUES (1, 2);
44+
45+
INSERT INTO users_roles(user_id, role_id) VALUES (2, 1);
46+
INSERT INTO users_roles(user_id, role_id) VALUES (3, 1);
47+
INSERT INTO users_roles(user_id, role_id) VALUES (4, 1);
48+
INSERT INTO users_roles(user_id, role_id) VALUES (5, 1);
49+
INSERT INTO users_roles(user_id, role_id) VALUES (6, 1);
50+
INSERT INTO users_roles(user_id, role_id) VALUES (7, 1);
51+
INSERT INTO users_roles(user_id, role_id) VALUES (8, 1);
52+
53+
54+
55+
INSERT INTO contacts(user_id, email, phone, note) VALUES (1, 'andrea.test@gmail.com', NULL, NULL);
56+
INSERT INTO contacts(user_id, email, phone, note) VALUES (2, 'mario.rossi@gmail.com', NULL, 'test contact note on mario rossi');
57+
INSERT INTO contacts(user_id, email, phone, note) VALUES (3, 'stefania.verdi@gmail.com', NULL, NULL);
58+
INSERT INTO contacts(user_id, email, phone, note) VALUES (4, 'veronica.gialli@gmail.com', NULL, NULL);
59+
INSERT INTO contacts(user_id, email, phone, note) VALUES (5, 'mark.green@gmail.com', NULL, NULL);
60+
INSERT INTO contacts(user_id, email, phone, note) VALUES (6, 'paul.ludwing@gmail.com', NULL, NULL);
61+
INSERT INTO contacts(user_id, email, phone, note) VALUES (7, 'jennifer.red@gmail.com', NULL, NULL);
62+
INSERT INTO contacts(user_id, email, phone, note) VALUES (8, 'karina.yellow@gmail.com', NULL, NULL);
63+
64+
insert into addresses(user_id, address, address2, city, country, zip_code) values (2, 'Via Filzi 2', 'Borgo Teresiano', 'Florence', 'Italy', '50100');
65+
insert into addresses(user_id, address, address2, city, country, zip_code) values (7, 'Piazza Grande 12', 'Gran canal', 'Venice', 'Italy', '30100');
66+
insert into addresses(user_id, address, address2, city, country, zip_code) values (8, 'Via Roma 2', 'Borgo Teresiano', 'Trieste', 'Italy', '34100');

0 commit comments

Comments
 (0)