diff --git a/README.md b/README.md index 5d19221..36bb540 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,12 @@ Docker Compose with command : `docker-compose up` ## Or try to test with [Swagger](http://ec2-16-170-234-204.eu-north-1.compute.amazonaws.com/swagger-ui/index.html#/)📍 +### Login +{
+"email": "awsadmin@example.com",
+"password": "1234567890"
+} + diff --git a/src/main/resources/db/changelog/changes/16-add-admin-to-users-table.yaml b/src/main/resources/db/changelog/changes/16-add-admin-to-users-table.yaml new file mode 100644 index 0000000..ab5c2bb --- /dev/null +++ b/src/main/resources/db/changelog/changes/16-add-admin-to-users-table.yaml @@ -0,0 +1,18 @@ +databaseChangeLog: + - changeSet: + id: add-admin-to-users-table + author: fmIst0 + changes: + - insert: + tableName: users + columns: + - column: + {name: "email", value: "awsadmin@example.com"} + - column: + {name: "password", value: "1234567890"} + - column: + {name: "first_name", value: "Bob"} + - column: + {name: "last_name", value: "Doe"} + - column: + {name: "shipping_address", value: "New Shipping Address"} \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/17-give-admin-role-to-user.yaml b/src/main/resources/db/changelog/changes/17-give-admin-role-to-user.yaml new file mode 100644 index 0000000..a77d978 --- /dev/null +++ b/src/main/resources/db/changelog/changes/17-give-admin-role-to-user.yaml @@ -0,0 +1,19 @@ +databaseChangeLog: + - changeSet: + id: give-admin-role-to-user + author: fmIst0 + changes: + - sql: + dbms: mysql + sql: | + INSERT INTO users_roles (user_id, role_id) + SELECT id, 1 + FROM users + WHERE email = 'awsadmin@example.com' + - sql: + dbms: mysql + sql: | + INSERT INTO users_roles (user_id, role_id) + SELECT id, 2 + FROM users + WHERE email = 'awsadmin@example.com' \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/17-reset-to-bencrypted-password-for-user.yaml b/src/main/resources/db/changelog/changes/17-reset-to-bencrypted-password-for-user.yaml new file mode 100644 index 0000000..a445af8 --- /dev/null +++ b/src/main/resources/db/changelog/changes/17-reset-to-bencrypted-password-for-user.yaml @@ -0,0 +1,12 @@ +databaseChangeLog: + - changeSet: + id: reset-to-bencrypted-password-for-user + author: fmIst0 + changes: + - update: + tableName: users + columns: + - column: + name: password + value: "$2a$10$v4st87IQUD8HRp07RoTbd.QOOU7VXLVaOORFx5UNbr6Galn8/O.lW" + where: email='awsadmin@example.com' diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index 4acc6f4..3b2e5db 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -28,4 +28,10 @@ databaseChangeLog: - include: file: db/changelog/changes/14-modify-data-type-order_total-order_items_price.yaml - include: - file: db/changelog/changes/15-make-column-name-categories-unique.yaml \ No newline at end of file + file: db/changelog/changes/15-make-column-name-categories-unique.yaml + - include: + file: db/changelog/changes/16-add-admin-to-users-table.yaml + - include: + file: db/changelog/changes/17-give-admin-role-to-user.yaml + - include: + file: db/changelog/changes/17-reset-to-bencrypted-password-for-user.yaml \ No newline at end of file diff --git a/src/test/java/com/bookstore/controller/ShoppingCartControllerTest.java b/src/test/java/com/bookstore/controller/ShoppingCartControllerTest.java index d5ddf1e..55163ae 100644 --- a/src/test/java/com/bookstore/controller/ShoppingCartControllerTest.java +++ b/src/test/java/com/bookstore/controller/ShoppingCartControllerTest.java @@ -92,6 +92,10 @@ static void teardown(DataSource dataSource) { connection, new ClassPathResource("database/shopping_carts/delete-from-shopping_carts.sql") ); + ScriptUtils.executeSqlScript( + connection, + new ClassPathResource("database/users_roles/delete-from-users-roles.sql") + ); ScriptUtils.executeSqlScript( connection, new ClassPathResource("database/users/delete-from-users.sql") diff --git a/src/test/resources/database/users_roles/delete-from-users-roles.sql b/src/test/resources/database/users_roles/delete-from-users-roles.sql new file mode 100644 index 0000000..d414654 --- /dev/null +++ b/src/test/resources/database/users_roles/delete-from-users-roles.sql @@ -0,0 +1 @@ +DELETE FROM users_roles; \ No newline at end of file