feat: organizing project architecture

Author: TiagoValdrich

build.gradle

@@ -21,7 +21,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.hibernate:hibernate-validator:7.0.4.Final'
+    implementation 'org.hibernate:hibernate-validator:7.0.5.Final'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'org.postgresql:postgresql'

src/main/java/com/scriptql/scriptqlapi/controllers/ConnectionManagerController.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.controllers;
 
 import com.scriptql.scriptqlapi.entities.DatabaseConnection;
+import com.scriptql.scriptqlapi.generic.AbstractController;
 import com.scriptql.scriptqlapi.services.ConnectionManagerService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/scriptql/scriptqlapi/controllers/QuerryController.java renamed to src/main/java/com/scriptql/scriptqlapi/controllers/QueryController.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.controllers;
 
 import com.scriptql.scriptqlapi.entities.Query;
+import com.scriptql.scriptqlapi.generic.AbstractController;
 import com.scriptql.scriptqlapi.services.QueryService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -11,9 +12,9 @@
 
 @RestController
 @RequestMapping("/query")
-public class QuerryController extends AbstractController<Query> {
+public class QueryController extends AbstractController<Query> {
 
-    public QuerryController(QueryService service) {
+    public QueryController(QueryService service) {
         super(service);
     }
 

src/main/java/com/scriptql/scriptqlapi/controllers/UserController.java

@@ -1,5 +1,6 @@
 package com.scriptql.scriptqlapi.controllers;
 
+import com.scriptql.scriptqlapi.generic.AbstractController;
 import com.scriptql.scriptqlapi.services.UserService;
 import com.scriptql.scriptqlapi.entities.User;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/scriptql/scriptqlapi/entities/DatabaseConnection.java

@@ -1,9 +1,11 @@
 package com.scriptql.scriptqlapi.entities;
 
 import com.scriptql.scriptqlapi.enums.DatabaseDriver;
+import com.scriptql.scriptqlapi.generic.IEntity;
 import lombok.Data;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
 
 @Data
 @Entity
@@ -12,10 +14,20 @@ public class DatabaseConnection implements IEntity {
 
     @Id
     private long id;
+
+    @NotEmpty
     private String host;
+
+    @NotEmpty
     private String database;
+
+    @NotEmpty
     private String username;
+
+    @NotEmpty
     private String password;
+
+    @NotEmpty
     private int port;
 
     @Enumerated(EnumType.STRING)

src/main/java/com/scriptql/scriptqlapi/entities/Query.java

@@ -1,5 +1,6 @@
 package com.scriptql.scriptqlapi.entities;
 
+import com.scriptql.scriptqlapi.generic.IEntity;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -9,7 +10,7 @@
 
 @Data
 @Entity
-@Table(name = "querys")
+@Table(name = "queries")
 public class Query implements IEntity {
 
     @Id

src/main/java/com/scriptql/scriptqlapi/entities/User.java

@@ -1,5 +1,6 @@
 package com.scriptql.scriptqlapi.entities;
 
+import com.scriptql.scriptqlapi.generic.IEntity;
 import lombok.Data;
 
 import javax.persistence.Entity;

src/main/java/com/scriptql/scriptqlapi/controllers/AbstractController.java renamed to src/main/java/com/scriptql/scriptqlapi/generic/AbstractController.java

@@ -1,7 +1,5 @@
-package com.scriptql.scriptqlapi.controllers;
+package com.scriptql.scriptqlapi.generic;
 
-import com.scriptql.scriptqlapi.services.AbstractService;
-import com.scriptql.scriptqlapi.entities.IEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/scriptql/scriptqlapi/repositories/AbstractRepository.java renamed to src/main/java/com/scriptql/scriptqlapi/generic/AbstractRepository.java

@@ -1,4 +1,4 @@
-package com.scriptql.scriptqlapi.repositories;
+package com.scriptql.scriptqlapi.generic;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/com/scriptql/scriptqlapi/services/AbstractService.java renamed to src/main/java/com/scriptql/scriptqlapi/generic/AbstractService.java

@@ -1,7 +1,5 @@
-package com.scriptql.scriptqlapi.services;
+package com.scriptql.scriptqlapi.generic;
 
-import com.scriptql.scriptqlapi.entities.IEntity;
-import com.scriptql.scriptqlapi.repositories.AbstractRepository;
 import com.scriptql.scriptqlapi.utils.Snowflake;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/scriptql/scriptqlapi/entities/IEntity.java renamed to src/main/java/com/scriptql/scriptqlapi/generic/IEntity.java

@@ -1,4 +1,4 @@
-package com.scriptql.scriptqlapi.entities;
+package com.scriptql.scriptqlapi.generic;
 
 public interface IEntity {
 

src/main/java/com/scriptql/scriptqlapi/repositories/DatabaseConnectionRepository.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.repositories;
 
 import com.scriptql.scriptqlapi.entities.DatabaseConnection;
+import com.scriptql.scriptqlapi.generic.AbstractRepository;
 
 public interface DatabaseConnectionRepository extends AbstractRepository<DatabaseConnection> {
 }

src/main/java/com/scriptql/scriptqlapi/repositories/QueryRepository.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.repositories;
 
 import com.scriptql.scriptqlapi.entities.Query;
+import com.scriptql.scriptqlapi.generic.AbstractRepository;
 
 public interface QueryRepository extends AbstractRepository<Query> {
 }

src/main/java/com/scriptql/scriptqlapi/repositories/UserRepository.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.repositories;
 
 import com.scriptql.scriptqlapi.entities.User;
+import com.scriptql.scriptqlapi.generic.AbstractRepository;
 
 import java.util.Optional;
 

src/main/java/com/scriptql/scriptqlapi/services/ConnectionManagerService.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.services;
 
 import com.scriptql.scriptqlapi.entities.DatabaseConnection;
+import com.scriptql.scriptqlapi.generic.AbstractService;
 import com.scriptql.scriptqlapi.repositories.DatabaseConnectionRepository;
 import com.scriptql.scriptqlapi.utils.Snowflake;
 import org.springframework.stereotype.Service;

src/main/java/com/scriptql/scriptqlapi/services/QueryService.java

@@ -1,11 +1,11 @@
 package com.scriptql.scriptqlapi.services;
 
 import com.scriptql.scriptqlapi.entities.Query;
+import com.scriptql.scriptqlapi.generic.AbstractService;
 import com.scriptql.scriptqlapi.repositories.QueryRepository;
 import com.scriptql.scriptqlapi.utils.Snowflake;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.Objects;
 
 @Service

src/main/java/com/scriptql/scriptqlapi/services/UserService.java

@@ -1,6 +1,7 @@
 package com.scriptql.scriptqlapi.services;
 
 import com.scriptql.scriptqlapi.entities.User;
+import com.scriptql.scriptqlapi.generic.AbstractService;
 import com.scriptql.scriptqlapi.repositories.UserRepository;
 import com.scriptql.scriptqlapi.utils.Snowflake;
 import org.springframework.security.crypto.bcrypt.BCrypt;

src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: ''
-    password: ''
-    username: ''
+    url: 'jdbc:postgresql://localhost:5432/scriptql'
+    password: '123'
+    username: 'postgres'
     driver-class-name: org.postgresql.Driver
   jpa:
     database-platform: org.hibernate.dialect.PostgreSQL10Dialect