create developer branch for common collaboration

Csaba79-coder · Csaba79-coder · commit b60735ea30ec · 2023-05-22T18:44:27.000+02:00
diff --git a/src/main/java/com/csaba79coder/littersnap/controller/UserController.java b/src/main/java/com/csaba79coder/littersnap/controller/UserController.java
@@ -1,6 +1,6 @@
 package com.csaba79coder.littersnap.controller;
 
-import com.csaba79coder.littersnap.model.service.UserService;
+import com.csaba79coder.littersnap.model.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/src/main/java/com/csaba79coder/littersnap/model/base/entity/Auditable.java b/src/main/java/com/csaba79coder/littersnap/model/base/entity/Auditable.java
@@ -1,4 +1,4 @@
-package com.csaba79coder.littersnap.model.entity.base;
+package com.csaba79coder.littersnap.model.base.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
diff --git a/src/main/java/com/csaba79coder/littersnap/model/base/entity/Identifier.java b/src/main/java/com/csaba79coder/littersnap/model/base/entity/Identifier.java
@@ -1,4 +1,4 @@
-package com.csaba79coder.littersnap.model.entity.base;
+package com.csaba79coder.littersnap.model.base.entity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
diff --git a/src/main/java/com/csaba79coder/littersnap/model/user/dto/RegisterUserDto.java b/src/main/java/com/csaba79coder/littersnap/model/user/dto/RegisterUserDto.java
@@ -0,0 +1,4 @@
+package com.csaba79coder.littersnap.model.user.dto;
+
+public class RegisterUserDto {
+}
diff --git a/src/main/java/com/csaba79coder/littersnap/model/user/entity/User.java b/src/main/java/com/csaba79coder/littersnap/model/user/entity/User.java
@@ -1,6 +1,6 @@
-package com.csaba79coder.littersnap.model.entity.user;
+package com.csaba79coder.littersnap.model.user.entity;
 
-import com.csaba79coder.littersnap.model.entity.base.Identifier;
+import com.csaba79coder.littersnap.model.base.entity.Auditable;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
@@ -17,7 +17,7 @@
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class User extends Identifier {
+public class User extends Auditable {
 
     @Column(name = "email", nullable = false, unique = true)
     private String email;
diff --git a/src/main/java/com/csaba79coder/littersnap/model/user/persistence/UserRepository.java b/src/main/java/com/csaba79coder/littersnap/model/user/persistence/UserRepository.java
@@ -1,6 +1,6 @@
-package com.csaba79coder.littersnap.model.persistence;
+package com.csaba79coder.littersnap.model.user.persistence;
 
-import com.csaba79coder.littersnap.model.entity.user.User;
+import com.csaba79coder.littersnap.model.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/src/main/java/com/csaba79coder/littersnap/model/user/service/UserService.java b/src/main/java/com/csaba79coder/littersnap/model/user/service/UserService.java
@@ -1,6 +1,6 @@
-package com.csaba79coder.littersnap.model.service;
+package com.csaba79coder.littersnap.model.user.service;
 
-import com.csaba79coder.littersnap.model.persistence.UserRepository;
+import com.csaba79coder.littersnap.model.user.persistence.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/csaba79coder/littersnap/view/UserViewController.java b/src/main/java/com/csaba79coder/littersnap/view/UserViewController.java
@@ -1,6 +1,6 @@
 package com.csaba79coder.littersnap.view;
 
-import com.csaba79coder.littersnap.model.service.UserService;
+import com.csaba79coder.littersnap.model.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,5 @@
 spring.jpa.hibernate.ddl-auto=update
 spring.datasource.url=jdbc:mysql://localhost:${DB_PORT_MYSQL}/${DB_URL_MYSQL_LITTER_SNAP}?createDatabaseIfNotExist=true&useSSL=true&sessionVariables=sql_mode='NO_ENGINE_SUBSTITUTION'&jdbcCompliantTruncation=false
-#spring.datasource.url=jdbc:mysql://localhost:${DB_PORT_MYSQL}/${DB_URL_MYSQL_REPR}?createDatabaseIfNotExist=true
 spring.datasource.username=${DB_USER_MYSQL}
 spring.datasource.password=${DB_PASSWORD_MYSQL}
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL55Dialect

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.csaba79coder.littersnap.model.entity.base;`
	`1`	`+package com.csaba79coder.littersnap.model.base.entity;`
`2`	`2`
`3`	`3`	`import jakarta.persistence.Column;`
`4`	`4`	`import jakarta.persistence.MappedSuperclass;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.csaba79coder.littersnap.model.user.dto;
++
 +public class RegisterUserDto {
 +}