flyway stuff

tofiksa · Jun 15, 2024 · bffe28a · bffe28a
1 parent 02f4480
commit bffe28a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/no/josefushighscore/controller/AuthenticationController.java b/src/main/java/no/josefushighscore/controller/AuthenticationController.java
@@ -1,11 +1,12 @@
 package no.josefushighscore.controller;
 
-import jakarta.validation.Valid;
 import no.josefushighscore.dto.LoginUserDto;
 import no.josefushighscore.dto.UserDto;
 import no.josefushighscore.exception.BadRequestException;
 import no.josefushighscore.service.APIResponse;
 import no.josefushighscore.service.UserLoginService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -23,6 +24,8 @@ public class AuthenticationController {
     @Autowired
     UserLoginService loginService;
 
+    Logger LOG = LoggerFactory.getLogger(AuthenticationController.class);
+
     @Secured("ROLE_ANONYMOUS")
     @PostMapping("/signin")
     public ResponseEntity<LoginUserDto> signin(@RequestBody LoginUserDto data) throws AuthenticationException {
@@ -35,9 +38,10 @@ public ResponseEntity<LoginUserDto> signin(@RequestBody LoginUserDto data) throw
 
     @Secured("ROLE_ANONYMOUS")
     @PostMapping("/register")
-    public ResponseEntity registerNewUserAccount(@Valid @RequestBody UserDto accountDto) throws BadRequestException {
+    public ResponseEntity registerNewUserAccount(@RequestBody UserDto accountDto) throws BadRequestException {
 
         APIResponse apiResponse = new APIResponse();
+        LOG.info(String.valueOf(accountDto));
         loginService.registerNewUserAccount(accountDto);
         apiResponse.setStatus(HttpStatus.CREATED);
         apiResponse.setMessage("User registered successfully");

diff --git a/src/main/java/no/josefushighscore/dto/UserDto.java b/src/main/java/no/josefushighscore/dto/UserDto.java
@@ -10,7 +10,7 @@ public class UserDto {
     @JsonProperty("username")
     private String username;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty("password")
     private String password;
 
     @JsonProperty("firstname")

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -20,12 +20,11 @@ spring:
     default-property-inclusion: non_empty
   flyway:
     url: ${spring.datasource.url}
+    schemas: josefushighscore
     enabled: true
     locations: classpath:/db/migration
     user: ${SUPABASE_JOSEFUS_DB_USER}
     password: ${SUPABASE_JOSEFUS_DB_PWD}
-    baseline-on-migrate: true
-    baseline-version: '0'
   jwt:
     secret: ${JOSEFUS_JWT_SECRET}
 

diff --git a/...n/resources/db.migration/V0_0_1__user.sql → ...b.migration/V0_0_1__create_table_user.sql b/...n/resources/db.migration/V0_0_1__user.sql → ...b.migration/V0_0_1__create_table_user.sql
@@ -1,5 +1,3 @@
-CREATE SCHEMA IF NOT EXISTS josefus;
-
 CREATE TABLE IF NOT EXISTS USER (
     user_id bigint NOT NULL,
     email varchar(255),

diff --git a/...urces/db.migration/V0_0_2__user_roles.sql → ...ation/V0_0_2__create_table_user_roles.sql b/...urces/db.migration/V0_0_2__user_roles.sql → ...ation/V0_0_2__create_table_user_roles.sql
diff --git a/.../resources/db.migration/V0_0_3__score.sql → ....migration/V0_0_3__create_table_score.sql b/.../resources/db.migration/V0_0_3__score.sql → ....migration/V0_0_3__create_table_score.sql
diff --git a/...n/resources/db.migration/V0_0_4__game.sql → ...b.migration/V0_0_4__create_table_game.sql b/...n/resources/db.migration/V0_0_4__game.sql → ...b.migration/V0_0_4__create_table_game.sql
diff --git a/...b.migration/V0_1_1__created_on_column.sql → ...gration/V0_1_1__alter_table_user_role.sql b/...b.migration/V0_1_1__created_on_column.sql → ...gration/V0_1_1__alter_table_user_role.sql