[release] 모아동 BE ver 1.0.3

backend/.gitignore

@@ -38,4 +38,4 @@ out/
 
 
 application.properties
-moadong.json
+moadong.json

backend/build.gradle

@@ -40,11 +40,53 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
+
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
+	testCompileOnly 'org.projectlombok:lombok'
+	testAnnotationProcessor 'org.projectlombok:lombok'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	// google drive
+	implementation 'com.google.api-client:google-api-client:2.0.0'
+	implementation 'com.google.oauth-client:google-oauth-client-jetty:1.34.1'
+	implementation 'com.google.apis:google-api-services-drive:v3-rev20220815-2.0.0'
+
+	// S3
+	implementation platform('software.amazon.awssdk:bom:2.25.8')
+	implementation 'software.amazon.awssdk:s3'
+	implementation 'software.amazon.awssdk:auth'
+
+	// resize tool
+	implementation 'net.coobird:thumbnailator:0.4.14'
+	implementation 'org.springframework:spring-test'
+
 }
 
-tasks.named('test') {
+//전체 테스트
+test {
+	description = 'Runs the total tests.'
 	useJUnitPlatform()
 }
+
+//유닛 테스트
+task unitTest(type: Test) {
+	group = 'verification'
+	description = 'Runs the unit tests.'
+	useJUnitPlatform{
+		includeTags 'UnitTest'
+		excludeTags 'IntegrationTest'
+
+	}
+}
+
+//통합 테스트
+task integrationTest(type: Test) {
+	group = 'verification'
+	description = 'Runs the integration tests.'
+	useJUnitPlatform{
+		includeTags 'IntegrationTest'
+		excludeTags 'UnitTest'
+	}
+}

backend/src/main/java/moadong/MoadongApplication.java

@@ -4,9 +4,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @RequiredArgsConstructor
+@EnableScheduling
 public class MoadongApplication {
 
     public static void main(String[] args) {

backend/src/main/java/moadong/club/controller/ClubApplyController.java

@@ -0,0 +1,63 @@
+package moadong.club.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import moadong.club.payload.request.ClubApplicationCreateRequest;
+import moadong.club.payload.request.ClubApplicationEditRequest;
+import moadong.club.payload.request.ClubApplyRequest;
+import moadong.club.service.ClubApplyService;
+import moadong.global.payload.Response;
+import moadong.user.annotation.CurrentUser;
+import moadong.user.payload.CustomUserDetails;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/club/{clubId}")
+@AllArgsConstructor
+@Tag(name = "Club_Apply", description = "클럽 지원서 API")
+public class ClubApplyController {
+
+    private final ClubApplyService clubApplyService;
+
+    @PostMapping("/application")
+    @Operation(summary = "클럽 지원서 생성", description = "클럽 지원서를 생성합니다")
+    @PreAuthorize("isAuthenticated()")
+    @SecurityRequirement(name = "BearerAuth")
+    public ResponseEntity<?> createClubApplication(@PathVariable String clubId,
+                                               @CurrentUser CustomUserDetails user,
+                                               @RequestBody @Validated ClubApplicationCreateRequest request) {
+        clubApplyService.createClubApplication(clubId, user, request);
+        return Response.ok("success create application");
+    }
+
+    @PutMapping("/application")
+    @Operation(summary = "클럽 지원서 수정", description = "클럽 지원서를 수정합니다")
+    @PreAuthorize("isAuthenticated()")
+    @SecurityRequirement(name = "BearerAuth")
+    public ResponseEntity<?> editClubApplication(@PathVariable String clubId,
+                                             @CurrentUser CustomUserDetails user,
+                                             @RequestBody @Validated ClubApplicationEditRequest request) {
+        clubApplyService.editClubApplication(clubId, user, request);
+        return Response.ok("success edit application");
+    }
+
+    @GetMapping("/apply")
+    @Operation(summary = "클럽 지원서 불러오기", description = "클럽 지원서를 불러옵니다")
+    public ResponseEntity<?> getClubApplication(@PathVariable String clubId) {
+        return clubApplyService.getClubApplication(clubId);
+    }
+
+    @PostMapping("/apply")
+    @Operation(summary = "클럽 지원", description = "클럽에 지원합니다")
+    public ResponseEntity<?>  applyToClub(@PathVariable String clubId,
+                                          @RequestBody @Validated ClubApplyRequest request) {
+        clubApplyService.applyToClub(clubId, request);
+        return Response.ok("success apply");
+    }
+
+}

backend/src/main/java/moadong/club/entity/Club.java

@@ -6,12 +6,14 @@
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import moadong.club.enums.ClubRecruitmentStatus;
 import moadong.club.enums.ClubState;
-import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 import moadong.club.payload.request.ClubInfoRequest;
+import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
@@ -41,16 +43,19 @@ public class Club {
 
     private String userId;
 
+    private Map<String, String> socialLinks;
 
     @Field("recruitmentInformation")
     private ClubRecruitmentInformation clubRecruitmentInformation;
+
     public Club() {
         this.name = "";
         this.category = "";
         this.division = "";
         this.state = ClubState.UNAVAILABLE;
         this.clubRecruitmentInformation = ClubRecruitmentInformation.builder().build();
     }
+
     public Club(String userId) {
         this.name = "";
         this.category = "";
@@ -74,6 +79,7 @@ public void update(ClubInfoRequest request) {
         this.category = request.category();
         this.division = request.division();
         this.state = ClubState.AVAILABLE;
+        this.socialLinks = request.socialLinks();
         this.clubRecruitmentInformation.update(request);
     }
 
@@ -88,4 +94,8 @@ public void updateLogo(String logo) {
     public void updateFeedImages(List<String> feedImages) {
         this.clubRecruitmentInformation.updateFeedImages(feedImages);
     }
+
+    public void updateRecruitmentStatus(ClubRecruitmentStatus clubRecruitmentStatus) {
+        this.clubRecruitmentInformation.updateRecruitmentStatus(clubRecruitmentStatus);
+    }
 }

backend/src/main/java/moadong/club/entity/ClubApplication.java

@@ -0,0 +1,38 @@
+package moadong.club.entity;
+
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import moadong.club.enums.ApplicationStatus;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Document("club_applications")
+@AllArgsConstructor
+@Getter
+@Builder(toBuilder = true)
+public class ClubApplication {
+
+    @Id
+    private String id;
+
+    private String questionId;
+
+    @Enumerated(EnumType.STRING)
+    @Builder.Default
+    ApplicationStatus status = ApplicationStatus.SUBMITTED;
+
+    @Builder.Default
+    private List<ClubQuestionAnswer> answers = new ArrayList<>();
+
+    @Builder.Default
+    LocalDateTime createdAt = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
+}

backend/src/main/java/moadong/club/entity/ClubApplicationQuestion.java

@@ -0,0 +1,37 @@
+package moadong.club.entity;
+
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import moadong.club.enums.ClubApplicationQuestionType;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Getter
+@Builder(toBuilder = true)
+public class ClubApplicationQuestion {
+
+    @NotNull
+    private Long id;
+
+    @NotNull
+    private String title;
+
+    @NotNull
+    private String description;
+
+    @Enumerated(EnumType.STRING)
+    @NotNull
+    private ClubApplicationQuestionType type;
+
+    @NotNull
+    private ClubQuestionOption options;
+
+    @NotNull
+    private List<ClubQuestionItem> items;
+
+}

backend/src/main/java/moadong/club/entity/ClubMetric.java

@@ -3,6 +3,8 @@
 import jakarta.persistence.Id;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -30,7 +32,7 @@ public class ClubMetric {
 
     @Builder
     public ClubMetric(String clubId, String ip) {
-        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime now = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
         this.clubId = clubId;
         this.ip = ip;
         this.inAt = now;
@@ -39,6 +41,6 @@ public ClubMetric(String clubId, String ip) {
     }
 
     public void update() {
-        this.outAt = LocalDateTime.now();
+        this.outAt = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
     }
 }

backend/src/main/java/moadong/club/entity/ClubQuestion.java

@@ -0,0 +1,53 @@
+package moadong.club.entity;
+
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Document("club_questions")
+@AllArgsConstructor
+@Getter
+@Builder(toBuilder = true)
+public class ClubQuestion {
+
+    @Id
+    private String id;
+
+    private String clubId;
+
+    @NotBlank
+    @Builder.Default
+    private String title = "";
+
+    @Builder.Default
+    private List<ClubApplicationQuestion> questions = new ArrayList<>();
+
+    @Builder.Default
+    private LocalDateTime createdAt = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
+
+    @Builder.Default
+    private LocalDateTime editedAt = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
+
+    public void updateFormTitle(String title) {
+        this.title = title;
+    }
+
+    public void updateQuestions(List<ClubApplicationQuestion> newQuestions) {
+        this.questions.clear();
+        this.questions.addAll(newQuestions);
+    }
+
+    public void updateEditedAt() {
+       this.editedAt = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
+    }
+
+}

backend/src/main/java/moadong/club/entity/ClubQuestionAnswer.java

@@ -0,0 +1,16 @@
+package moadong.club.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@Builder(toBuilder = true)
+public class ClubQuestionAnswer {
+
+    private Long id;
+
+    private String value;
+
+}

backend/src/main/java/moadong/club/entity/ClubQuestionItem.java

@@ -0,0 +1,14 @@
+package moadong.club.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@Builder(toBuilder = true)
+public class ClubQuestionItem {
+
+    private String value;
+
+}

backend/src/main/java/moadong/club/entity/ClubQuestionOption.java

@@ -0,0 +1,14 @@
+package moadong.club.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@Builder(toBuilder = true)
+public class ClubQuestionOption {
+
+    private Boolean required;
+
+}