enhancement(projects): added project data structures

Shiperist · Jul 25, 2023 · 45e1a46 · 45e1a46
1 parent 9d13e6a
commit 45e1a46
Show file tree

Hide file tree

Showing 23 changed files with 77 additions and 48 deletions.
diff --git a/...a/dev/shiperist/entity/AccountEntity.java → ...iperist/entity/account/AccountEntity.java b/...a/dev/shiperist/entity/AccountEntity.java → ...iperist/entity/account/AccountEntity.java
@@ -1,4 +1,4 @@
-package dev.shiperist.entity;
+package dev.shiperist.entity.account;
 
 import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
 import jakarta.persistence.*;

diff --git a/...a/dev/shiperist/entity/SessionEntity.java → ...iperist/entity/account/SessionEntity.java b/...a/dev/shiperist/entity/SessionEntity.java → ...iperist/entity/account/SessionEntity.java
@@ -1,12 +1,10 @@
-package dev.shiperist.entity;
+package dev.shiperist.entity.account;
 
 import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.sql.Time;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data

diff --git a/...java/dev/shiperist/entity/UserEntity.java → .../shiperist/entity/account/UserEntity.java b/...java/dev/shiperist/entity/UserEntity.java → .../shiperist/entity/account/UserEntity.java
@@ -1,12 +1,10 @@
-package dev.shiperist.entity;
+package dev.shiperist.entity.account;
 
 import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.sql.Time;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Set;
 

diff --git a/server/src/main/java/dev/shiperist/entity/project/ProjectEntity.java b/server/src/main/java/dev/shiperist/entity/project/ProjectEntity.java
@@ -0,0 +1,29 @@
+package dev.shiperist.entity.project;
+
+import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
+import jakarta.persistence.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Entity(name = "Account")
+@Table(name = "account", schema = "public")
+@EqualsAndHashCode(callSuper = true)
+public class ProjectEntity extends PanacheEntityBase {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "display_name")
+    private String displayName;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "image")
+    private String image;
+}
diff --git a/server/src/main/java/dev/shiperist/mapper/QuarkusMappingConfig.java b/server/src/main/java/dev/shiperist/mapper/QuarkusMappingConfig.java
@@ -3,5 +3,5 @@
 import org.mapstruct.MapperConfig;
 
 @MapperConfig(componentModel = "jakarta-cdi")
-interface QuarkusMappingConfig {
+public interface QuarkusMappingConfig {
 }
diff --git a/...a/dev/shiperist/mapper/AccountMapper.java → ...iperist/mapper/account/AccountMapper.java b/...a/dev/shiperist/mapper/AccountMapper.java → ...iperist/mapper/account/AccountMapper.java
@@ -1,7 +1,8 @@
-package dev.shiperist.mapper;
+package dev.shiperist.mapper.account;
 
-import dev.shiperist.entity.AccountEntity;
-import dev.shiperist.model.Account;
+import dev.shiperist.entity.account.AccountEntity;
+import dev.shiperist.mapper.QuarkusMappingConfig;
+import dev.shiperist.model.account.Account;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;

diff --git a/...a/dev/shiperist/mapper/SessionMapper.java → ...iperist/mapper/account/SessionMapper.java b/...a/dev/shiperist/mapper/SessionMapper.java → ...iperist/mapper/account/SessionMapper.java
@@ -1,7 +1,8 @@
-package dev.shiperist.mapper;
+package dev.shiperist.mapper.account;
 
-import dev.shiperist.entity.SessionEntity;
-import dev.shiperist.model.Session;
+import dev.shiperist.entity.account.SessionEntity;
+import dev.shiperist.mapper.QuarkusMappingConfig;
+import dev.shiperist.model.account.Session;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;

diff --git a/...java/dev/shiperist/mapper/UserMapper.java → .../shiperist/mapper/account/UserMapper.java b/...java/dev/shiperist/mapper/UserMapper.java → .../shiperist/mapper/account/UserMapper.java
@@ -1,7 +1,8 @@
-package dev.shiperist.mapper;
+package dev.shiperist.mapper.account;
 
-import dev.shiperist.entity.UserEntity;
-import dev.shiperist.model.User;
+import dev.shiperist.entity.account.UserEntity;
+import dev.shiperist.mapper.QuarkusMappingConfig;
+import dev.shiperist.model.account.User;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;

diff --git a/...ain/java/dev/shiperist/model/Account.java → .../dev/shiperist/model/account/Account.java b/...ain/java/dev/shiperist/model/Account.java → .../dev/shiperist/model/account/Account.java
@@ -1,6 +1,6 @@
-package dev.shiperist.model;
+package dev.shiperist.model.account;
 
-import dev.shiperist.entity.UserEntity;
+import dev.shiperist.entity.account.UserEntity;
 import lombok.Data;
 
 @Data

diff --git a/...ain/java/dev/shiperist/model/Session.java → .../dev/shiperist/model/account/Session.java b/...ain/java/dev/shiperist/model/Session.java → .../dev/shiperist/model/account/Session.java
@@ -1,10 +1,8 @@
-package dev.shiperist.model;
+package dev.shiperist.model.account;
 
-import dev.shiperist.entity.UserEntity;
+import dev.shiperist.entity.account.UserEntity;
 import lombok.Data;
 
-import java.sql.Time;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data

diff --git a/...c/main/java/dev/shiperist/model/User.java → ...ava/dev/shiperist/model/account/User.java b/...c/main/java/dev/shiperist/model/User.java → ...ava/dev/shiperist/model/account/User.java
@@ -1,11 +1,9 @@
-package dev.shiperist.model;
+package dev.shiperist.model.account;
 
-import dev.shiperist.entity.AccountEntity;
-import dev.shiperist.entity.SessionEntity;
+import dev.shiperist.entity.account.AccountEntity;
+import dev.shiperist.entity.account.SessionEntity;
 import lombok.Data;
 
-import java.sql.Time;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Set;
 

diff --git a/.../dev/shiperist/model/UserCredentials.java → ...perist/model/account/UserCredentials.java b/.../dev/shiperist/model/UserCredentials.java → ...perist/model/account/UserCredentials.java
@@ -1,4 +1,4 @@
-package dev.shiperist.model;
+package dev.shiperist.model.account;
 
 import lombok.Data;
 

diff --git a/server/src/main/java/dev/shiperist/model/project/Project.java b/server/src/main/java/dev/shiperist/model/project/Project.java
@@ -0,0 +1,4 @@
+package dev.shiperist.model.project;
+
+public class Project {
+}
diff --git a/server/src/main/java/dev/shiperist/repository/AccountRepository.java b/server/src/main/java/dev/shiperist/repository/AccountRepository.java
@@ -1,6 +1,6 @@
 package dev.shiperist.repository;
 
-import dev.shiperist.entity.AccountEntity;
+import dev.shiperist.entity.account.AccountEntity;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
 import io.quarkus.hibernate.reactive.panache.common.WithSession;
 import jakarta.enterprise.context.ApplicationScoped;

diff --git a/server/src/main/java/dev/shiperist/repository/SessionRepository.java b/server/src/main/java/dev/shiperist/repository/SessionRepository.java
@@ -1,6 +1,6 @@
 package dev.shiperist.repository;
 
-import dev.shiperist.entity.SessionEntity;
+import dev.shiperist.entity.account.SessionEntity;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
 import io.quarkus.hibernate.reactive.panache.common.WithSession;
 import io.smallrye.mutiny.Uni;

diff --git a/server/src/main/java/dev/shiperist/repository/UserRepository.java b/server/src/main/java/dev/shiperist/repository/UserRepository.java
@@ -1,6 +1,6 @@
 package dev.shiperist.repository;
 
-import dev.shiperist.entity.UserEntity;
+import dev.shiperist.entity.account.UserEntity;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
 import io.quarkus.hibernate.reactive.panache.common.WithSession;
 import io.smallrye.mutiny.Uni;

diff --git a/server/src/main/java/dev/shiperist/resource/AuthService.java b/server/src/main/java/dev/shiperist/resource/AuthService.java
@@ -1,6 +1,6 @@
 package dev.shiperist.resource;
 
-import dev.shiperist.model.User;
+import dev.shiperist.model.account.User;
 import dev.shiperist.service.AccountService;
 import dev.shiperist.service.SessionService;
 import dev.shiperist.service.UserService;
@@ -11,7 +11,6 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.Optional;
 

diff --git a/server/src/main/java/dev/shiperist/resource/ProjectResource.java b/server/src/main/java/dev/shiperist/resource/ProjectResource.java
@@ -0,0 +1,4 @@
+package dev.shiperist.resource;
+
+public class ProjectResource {
+}
diff --git a/server/src/main/java/dev/shiperist/security/CustomIdentityProvider.java b/server/src/main/java/dev/shiperist/security/CustomIdentityProvider.java
@@ -1,6 +1,6 @@
 package dev.shiperist.security;
 
-import dev.shiperist.model.User;
+import dev.shiperist.model.account.User;
 import dev.shiperist.service.SessionService;
 import dev.shiperist.service.UserService;
 import io.quarkus.security.AuthenticationFailedException;

diff --git a/server/src/main/java/dev/shiperist/service/AccountService.java b/server/src/main/java/dev/shiperist/service/AccountService.java
@@ -1,8 +1,8 @@
 package dev.shiperist.service;
 
-import dev.shiperist.entity.AccountEntity;
-import dev.shiperist.mapper.AccountMapper;
-import dev.shiperist.model.Account;
+import dev.shiperist.entity.account.AccountEntity;
+import dev.shiperist.mapper.account.AccountMapper;
+import dev.shiperist.model.account.Account;
 import dev.shiperist.repository.AccountRepository;
 import io.quarkus.hibernate.reactive.panache.common.WithTransaction;
 import io.smallrye.mutiny.Uni;

diff --git a/server/src/main/java/dev/shiperist/service/SessionService.java b/server/src/main/java/dev/shiperist/service/SessionService.java
@@ -1,9 +1,9 @@
 package dev.shiperist.service;
 
-import dev.shiperist.entity.SessionEntity;
-import dev.shiperist.mapper.SessionMapper;
-import dev.shiperist.model.Session;
-import dev.shiperist.model.User;
+import dev.shiperist.entity.account.SessionEntity;
+import dev.shiperist.mapper.account.SessionMapper;
+import dev.shiperist.model.account.Session;
+import dev.shiperist.model.account.User;
 import dev.shiperist.repository.SessionRepository;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -14,9 +14,7 @@
 import jakarta.inject.Inject;
 
 import java.security.Key;
-import java.sql.Time;
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.Optional;

diff --git a/server/src/main/java/dev/shiperist/service/UserService.java b/server/src/main/java/dev/shiperist/service/UserService.java
@@ -1,9 +1,9 @@
 package dev.shiperist.service;
 
 import at.favre.lib.crypto.bcrypt.BCrypt;
-import dev.shiperist.entity.UserEntity;
-import dev.shiperist.mapper.UserMapper;
-import dev.shiperist.model.User;
+import dev.shiperist.entity.account.UserEntity;
+import dev.shiperist.mapper.account.UserMapper;
+import dev.shiperist.model.account.User;
 import dev.shiperist.repository.UserRepository;
 import io.quarkus.hibernate.reactive.panache.common.WithTransaction;
 import io.smallrye.mutiny.Uni;

diff --git a/server/src/test/java/dev/shiperist/AuthResourceTest.java b/server/src/test/java/dev/shiperist/AuthResourceTest.java
@@ -1,6 +1,6 @@
 package dev.shiperist;
 
-import dev.shiperist.model.User;
+import dev.shiperist.model.account.User;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;