enhancements(backend): Refactor User module

server/src/main/java/dev/shiperist/user/entity/AccountEntity.java → server/src/main/java/dev/shiperist/entity/AccountEntity.java

@@ -1,14 +1,14 @@
-package dev.shiperist.user.entity;
+package dev.shiperist.entity;
 
 import io.quarkus.hibernate.reactive.panache.PanacheEntity;
 import jakarta.persistence.*;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-@Getter
-@Builder
+@Data
 @Entity
 @Table(name = "account")
+@EqualsAndHashCode(callSuper = true)
 public class AccountEntity extends PanacheEntity {
 
     @Column(name = "user_id")

server/src/main/java/dev/shiperist/user/entity/SessionEntity.java → server/src/main/java/dev/shiperist/entity/SessionEntity.java

@@ -1,16 +1,16 @@
-package dev.shiperist.user.entity;
+package dev.shiperist.entity;
 
 import io.quarkus.hibernate.reactive.panache.PanacheEntity;
 import jakarta.persistence.*;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
 
-@Getter
-@Builder
+@Data
 @Entity
 @Table(name = "session")
+@EqualsAndHashCode(callSuper = true)
 public class SessionEntity extends PanacheEntity {
 
     @Column(name = "session_token", unique = true)

server/src/main/java/dev/shiperist/user/entity/UserEntity.java → server/src/main/java/dev/shiperist/entity/UserEntity.java

@@ -1,20 +1,20 @@
-package dev.shiperist.user.entity;
+package dev.shiperist.entity;
 
 import io.quarkus.hibernate.reactive.panache.PanacheEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import lombok.Builder;
-import lombok.Getter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
 import java.util.Set;
 
-@Getter
-@Builder
+@Data
 @Entity
 @Table(name = "user")
+@EqualsAndHashCode(callSuper = true)
 public class UserEntity extends PanacheEntity {
 
     @Column(name = "name")

server/src/main/java/dev/shiperist/user/mapper/AccountMapper.java → server/src/main/java/dev/shiperist/mapper/AccountMapper.java

@@ -1,7 +1,7 @@
-package dev.shiperist.user.mapper;
+package dev.shiperist.mapper;
 
-import dev.shiperist.user.entity.AccountEntity;
-import dev.shiperist.user.model.Account;
+import dev.shiperist.entity.AccountEntity;
+import dev.shiperist.model.Account;
 import org.mapstruct.Mapper;
 
 @Mapper(componentModel = "jakarta")

server/src/main/java/dev/shiperist/user/mapper/SessionMapper.java → server/src/main/java/dev/shiperist/mapper/SessionMapper.java

@@ -1,7 +1,7 @@
-package dev.shiperist.user.mapper;
+package dev.shiperist.mapper;
 
-import dev.shiperist.user.entity.SessionEntity;
-import dev.shiperist.user.model.Session;
+import dev.shiperist.entity.SessionEntity;
+import dev.shiperist.model.Session;
 import org.mapstruct.Mapper;
 
 @Mapper(componentModel = "jakarta")

server/src/main/java/dev/shiperist/user/mapper/UserMapper.java → server/src/main/java/dev/shiperist/mapper/UserMapper.java

@@ -1,7 +1,7 @@
-package dev.shiperist.user.mapper;
+package dev.shiperist.mapper;
 
-import dev.shiperist.user.entity.UserEntity;
-import dev.shiperist.user.model.User;
+import dev.shiperist.entity.UserEntity;
+import dev.shiperist.model.User;
 import org.mapstruct.Mapper;
 
 @Mapper(componentModel = "jakarta")

server/src/main/java/dev/shiperist/user/model/Account.java → server/src/main/java/dev/shiperist/model/Account.java

@@ -1,9 +1,9 @@
-package dev.shiperist.user.model;
+package dev.shiperist.model;
 
-import dev.shiperist.user.entity.UserEntity;
-import lombok.Getter;
+import dev.shiperist.entity.UserEntity;
+import lombok.Data;
 
-@Getter
+@Data
 public class Account {
     private String userId;
     private String type;

server/src/main/java/dev/shiperist/user/model/Session.java → server/src/main/java/dev/shiperist/model/Session.java

@@ -1,11 +1,11 @@
-package dev.shiperist.user.model;
+package dev.shiperist.model;
 
-import dev.shiperist.user.entity.UserEntity;
-import lombok.Getter;
+import dev.shiperist.entity.UserEntity;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 
-@Getter
+@Data
 public class Session {
     private String sessionToken;
     private String userId;

server/src/main/java/dev/shiperist/user/model/User.java → server/src/main/java/dev/shiperist/model/User.java

@@ -1,13 +1,13 @@
-package dev.shiperist.user.model;
+package dev.shiperist.model;
 
-import dev.shiperist.user.entity.AccountEntity;
-import dev.shiperist.user.entity.SessionEntity;
-import lombok.Getter;
+import dev.shiperist.entity.AccountEntity;
+import dev.shiperist.entity.SessionEntity;
+import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.util.Set;
 
-@Getter
+@Data
 public class User {
     private String name;
     private String email;

server/src/main/java/dev/shiperist/user/repository/AccountRepository.java → server/src/main/java/dev/shiperist/repository/AccountRepository.java

@@ -1,6 +1,6 @@
-package dev.shiperist.user.repository;
+package dev.shiperist.repository;
 
-import dev.shiperist.user.entity.AccountEntity;
+import dev.shiperist.entity.AccountEntity;
 import io.quarkus.hibernate.reactive.panache.PanacheRepository;
 
 public class AccountRepository implements PanacheRepository<AccountEntity> {

server/src/main/java/dev/shiperist/user/repository/SessionRepository.java → server/src/main/java/dev/shiperist/repository/SessionRepository.java

@@ -1,6 +1,6 @@
-package dev.shiperist.user.repository;
+package dev.shiperist.repository;
 
-import dev.shiperist.user.entity.SessionEntity;
+import dev.shiperist.entity.SessionEntity;
 import io.quarkus.hibernate.reactive.panache.PanacheRepository;
 
 public class SessionRepository implements PanacheRepository<SessionEntity> {

server/src/main/java/dev/shiperist/repository/UserRepository.java

@@ -0,0 +1,12 @@
+package dev.shiperist.repository;
+
+import dev.shiperist.entity.UserEntity;
+import io.quarkus.hibernate.reactive.panache.PanacheRepository;
+import io.smallrye.mutiny.Uni;
+
+public class UserRepository implements PanacheRepository<UserEntity> {
+
+    public Uni<UserEntity> findByEmail(String email) {
+        return find("email", email).firstResult();
+    }
+}

server/src/main/java/dev/shiperist/resource/AccountService.java

@@ -0,0 +1,47 @@
+package dev.shiperist.resource;
+
+import dev.shiperist.entity.AccountEntity;
+import dev.shiperist.mapper.AccountMapper;
+import dev.shiperist.model.Account;
+import dev.shiperist.repository.AccountRepository;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+
+import java.util.Optional;
+
+@ApplicationScoped
+public class AccountService {
+
+    @Inject
+    AccountRepository accountRepository;
+
+    @Inject
+    AccountMapper accountMapper;
+
+    @Transactional
+    public Uni<Account> createAccount(Account account) {
+        AccountEntity accountEntity = accountMapper.toEntity(account);
+        return accountRepository.persist(accountEntity).map(accountMapper::toDomain);
+    }
+
+    @Transactional
+    public Uni<Optional<Account>> getAccount(Long id) {
+        return accountRepository.findById(id)
+                .map(accountMapper::toDomain)
+                .map(Optional::of)
+                .onItem().ifNull().continueWith(Optional.empty());
+    }
+
+    @Transactional
+    public Uni<Account> updateAccount(Account account) {
+        AccountEntity accountEntity = accountMapper.toEntity(account);
+        return accountRepository.persist(accountEntity).map(accountMapper::toDomain);
+    }
+
+    @Transactional
+    public Uni<Boolean> deleteAccount(Long accountId) {
+        return accountRepository.deleteById(accountId);
+    }
+}

server/src/main/java/dev/shiperist/resource/SessionService.java

@@ -0,0 +1,47 @@
+package dev.shiperist.resource;
+
+import dev.shiperist.entity.SessionEntity;
+import dev.shiperist.mapper.SessionMapper;
+import dev.shiperist.model.Session;
+import dev.shiperist.repository.SessionRepository;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+
+import java.util.Optional;
+
+@ApplicationScoped
+public class SessionService {
+
+    @Inject
+    SessionRepository sessionRepository;
+
+    @Inject
+    SessionMapper sessionMapper;
+
+    @Transactional
+    public Uni<Session> createSession(Session session) {
+        SessionEntity sessionEntity = sessionMapper.toEntity(session);
+        return sessionRepository.persist(sessionEntity).map(sessionMapper::toDomain);
+    }
+
+    @Transactional
+    public Uni<Optional<Session>> getSession(Long id) {
+        return sessionRepository.findById(id)
+                .map(sessionMapper::toDomain)
+                .map(Optional::of)
+                .onItem().ifNull().continueWith(Optional.empty());
+    }
+
+    @Transactional
+    public Uni<Session> updateSession(Session session) {
+        SessionEntity sessionEntity = sessionMapper.toEntity(session);
+        return sessionRepository.persist(sessionEntity).map(sessionMapper::toDomain);
+    }
+
+    @Transactional
+    public Uni<Boolean> deleteSession(Long sessionId) {
+        return sessionRepository.deleteById(sessionId);
+    }
+}

server/src/main/java/dev/shiperist/resource/UserService.java

@@ -0,0 +1,55 @@
+package dev.shiperist.resource;
+
+import dev.shiperist.entity.UserEntity;
+import dev.shiperist.mapper.UserMapper;
+import dev.shiperist.model.User;
+import dev.shiperist.repository.UserRepository;
+import io.smallrye.mutiny.Uni;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+
+import java.util.Optional;
+
+@ApplicationScoped
+public class UserService {
+
+    @Inject
+    UserRepository userRepository;
+
+    @Inject
+    UserMapper userMapper;
+
+    @Transactional
+    public Uni<User> createUser(User user) {
+        UserEntity userEntity = userMapper.toEntity(user);
+        return userRepository.persist(userEntity).map(userMapper::toDomain);
+    }
+
+    @Transactional
+    public Uni<Optional<User>> getUser(Long id) {
+        return userRepository.findById(id)
+                .map(userMapper::toDomain)
+                .map(Optional::of)
+                .onItem().ifNull().continueWith(Optional.empty());
+    }
+
+    @Transactional
+    public Uni<Optional<User>> getUserByEmail(String email) {
+        return userRepository.findByEmail(email)
+                .map(userMapper::toDomain)
+                .map(Optional::of)
+                .onItem().ifNull().continueWith(Optional.empty());
+    }
+
+    @Transactional
+    public Uni<User> updateUser(User user) {
+        UserEntity userEntity = userMapper.toEntity(user);
+        return userRepository.persist(userEntity).map(userMapper::toDomain);
+    }
+
+    @Transactional
+    public Uni<Boolean> deleteUser(Long userId) {
+        return userRepository.deleteById(userId);
+    }
+}

server/src/main/java/dev/shiperist/service/AuthService.java

@@ -0,0 +1,9 @@
+package dev.shiperist.service;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class AuthService {
+
+
+}