Merge pull request #9 from TaskFlow-CLAP/CLAP-28

CLAP-28 패키지 구조 설정 및 �global 설정

Author: joowojr

.gitignore

@@ -5,6 +5,9 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 
+### env ###
+!**/src/main/resources/env.properties
+
 ### STS ###
 .apt_generated
 .classpath

build.gradle

@@ -26,10 +26,6 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
-    // lombok
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
     // validator
     implementation 'org.springframework.boot:spring-boot-starter-validation:3.4.1'
 
@@ -60,9 +56,13 @@ dependencies {
     //implementation 'org.springframework.boot:spring-boot-starter-security'
     // testImplementation 'org.springframework.security:spring-security-test'
 
-    // MapStruct
+    // Mapstruct
+    implementation "org.projectlombok:lombok"
     implementation 'org.mapstruct:mapstruct:1.5.3.Final'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final'
+
+    annotationProcessor "org.projectlombok:lombok"
+    annotationProcessor "org.mapstruct:mapstruct-processor:1.5.3.Final"
+    annotationProcessor 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
 
     // Junit
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberController.java

@@ -0,0 +1,21 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.RegisterMemberRequest;
+import clap.server.application.RegisterMemberService;
+import clap.server.common.annotation.architecture.WebAdapter;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@WebAdapter
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/managements")
+public class RegisterMemberController {
+    private final RegisterMemberService memberService;
+
+    @PostMapping("/members")
+    public void registerMember(@RequestBody @Valid RegisterMemberRequest request) {
+        memberService.registerMember(1l, request);
+    }
+}

src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java

@@ -0,0 +1,9 @@
+package clap.server.adapter.inbound.web.auth;
+
+import clap.server.common.annotation.architecture.WebAdapter;
+import org.springframework.web.bind.annotation.RestController;
+
+@WebAdapter
+@RestController
+public class AuthController {
+}

src/main/java/clap/server/adapter/inbound/web/auth/ResetPasswordController.java

@@ -0,0 +1,9 @@
+package clap.server.adapter.inbound.web.auth;
+
+import clap.server.common.annotation.architecture.WebAdapter;
+import org.springframework.web.bind.annotation.RestController;
+
+@WebAdapter
+@RestController
+public class ResetPasswordController {
+}

src/main/java/clap/server/adapter/inbound/web/dto/admin/RegisterMemberRequest.java

@@ -0,0 +1,26 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record RegisterMemberRequest(
+        @NotBlank
+        String name,
+        @NotBlank
+        String email,
+        @NotBlank
+        String nickname,
+        @NotNull
+        Boolean isReviewer,
+        @NotNull
+        Long departmentId,
+        @NotNull
+        MemberRole role,
+        @NotBlank
+        String departmentRole,
+        @NotNull
+        Long adminId
+) {
+}
+

src/main/java/clap/server/adapter/outbound/persistense/DepartmentPersistentAdapter.java

@@ -0,0 +1,25 @@
+package clap.server.adapter.outbound.persistense;
+
+import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
+import clap.server.adapter.outbound.persistense.mapper.DepartmentPersistenceMapper;
+import clap.server.adapter.outbound.persistense.repository.member.DepartmentRepository;
+import clap.server.application.port.outbound.member.CommandDepartmentPort;
+import clap.server.application.port.outbound.member.LoadDepartmentPort;
+import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.domain.model.member.Department;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Optional;
+
+@PersistenceAdapter
+@RequiredArgsConstructor
+public class DepartmentPersistentAdapter implements LoadDepartmentPort, CommandDepartmentPort {
+    private final DepartmentRepository departmentRepository;
+    private final DepartmentPersistenceMapper departmentPersistenceMapper;
+
+    @Override
+    public Optional<Department> findById(Long id) {
+        Optional<DepartmentEntity> departmentEntity = departmentRepository.findById(id);
+        return departmentEntity.map(departmentPersistenceMapper::toDomain);
+    }
+}

src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java

@@ -0,0 +1,38 @@
+package clap.server.adapter.outbound.persistense;
+
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
+import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
+import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.application.port.outbound.member.CommandMemberPort;
+import clap.server.common.annotation.architecture.PersistenceAdapter;
+import clap.server.domain.model.member.Member;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Optional;
+
+@PersistenceAdapter
+@RequiredArgsConstructor
+public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
+    private final MemberRepository memberRepository;
+    private final MemberPersistenceMapper memberPersistenceMapper;
+
+    @Override
+    public Optional<Member> findById(final Long id) {
+        Optional<MemberEntity> memberEntity = memberRepository.findById(id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public Optional<Member> findActiveMemberById(Long id) {
+        Optional<MemberEntity> memberEntity = memberRepository.findByMemberStatusAndMemberId(MemberStatus.ACTIVE, id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public void save(final Member member) {
+        MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);
+        memberRepository.save(memberEntity);
+    }
+}

src/main/java/clap/server/adapter/outbound/persistense/entity/log/ApiLogEntity.java

@@ -1,5 +1,6 @@
 package clap.server.adapter.outbound.persistense.entity.log;
 
+import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
 import clap.server.adapter.outbound.persistense.entity.log.constant.ApiHttpMethod;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
@@ -16,7 +17,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "DTYPE")
-public class ApiLogEntity {
+public class ApiLogEntity extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long logId;

src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java

@@ -1,6 +1,8 @@
 package clap.server.adapter.outbound.persistense.entity.member;
 
 import clap.server.adapter.outbound.persistense.entity.common.BaseTimeEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -17,12 +19,44 @@ public class MemberEntity extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long memberId;
 
-    @Embedded
-    private MemberInfo memberInfo;
+    @Column(nullable = false)
+    private String name;
+
+    @Column(unique = true, nullable = false)
+    private String email;
+
+    @Column(unique = true, nullable = false)
+    private String nickname;
+
+    @Column(nullable = false)
+    private boolean isReviewer;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "department_id", nullable = false)
+    private DepartmentEntity department;
+
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private MemberRole role;
+
+    @Column(nullable = false)
+    private String departmentRole;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private MemberStatus memberStatus;
+
+    // TODO: spring security 적용 예정
+    @Column(nullable = false)
+    private String password;
 
     @Column
     private String imageUrl;
 
     @Column
     private Boolean notificationEnabled;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "admin_id", nullable = false)
+    private MemberEntity admin;
 }