Merge pull request #766 from Moadong/develop/be

[Release] BE v1.0.8 배포

Author: Zepelown

backend/build.gradle

@@ -48,20 +48,16 @@ dependencies {
 	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 'software.amazon.awssdk:s3:2.26.0'
 	implementation 'software.amazon.awssdk:auth:2.26.0'
-//	implementation 'software.amazon.awssdk:netty-nio-client:2.26.0'
 
 	// resize tool
 	implementation 'net.coobird:thumbnailator:0.4.14'
 	implementation 'org.springframework:spring-test'
 
+
+
 }
 
 //전체 테스트

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

@@ -5,18 +5,28 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
+import java.util.List;
 import lombok.AllArgsConstructor;
-import moadong.club.payload.request.*;
+import moadong.club.payload.request.ClubApplicantDeleteRequest;
+import moadong.club.payload.request.ClubApplicantEditRequest;
+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.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/api/club/{clubId}")

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

@@ -3,12 +3,10 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import moadong.club.payload.request.ClubInfoRequest;
 import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 import moadong.club.payload.response.ClubDetailedResponse;
-import moadong.club.service.ClubMetricService;
 import moadong.club.service.ClubProfileService;
 import moadong.global.payload.Response;
 import moadong.user.annotation.CurrentUser;
@@ -30,20 +28,11 @@
 public class ClubProfileController {
 
     private final ClubProfileService clubProfileService;
-    private final ClubMetricService clubMetricService;
 
     @GetMapping("/{clubId}")
     @Operation(summary = "클럽 상세 정보 조회", description = "클럽 상세 정보를 조회합니다.")
-    public ResponseEntity<?> getClubDetail(
-        HttpServletRequest request,
-        @PathVariable String clubId) {
-        String ip = request.getHeader("X-Forwarded-For");
-        if (ip == null || ip.isEmpty()) {
-            ip = request.getRemoteAddr();
-        }
-        clubMetricService.patch(clubId, ip);
-        ClubDetailedResponse clubDetailedPageResponse = clubProfileService.getClubDetail(
-            clubId);
+    public ResponseEntity<?> getClubDetail(@PathVariable String clubId) {
+        ClubDetailedResponse clubDetailedPageResponse = clubProfileService.getClubDetail(clubId);
         return Response.ok(clubDetailedPageResponse);
     }
 

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

@@ -3,7 +3,6 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import moadong.club.enums.ClubRecruitmentStatus;
 import moadong.club.payload.response.ClubSearchResponse;
 import moadong.club.service.ClubSearchService;
 import moadong.global.exception.ErrorCode;

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

@@ -1,5 +1,7 @@
 package moadong.club.entity;
 
+import java.util.List;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -15,9 +17,6 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
-import java.util.List;
-import java.util.Map;
-
 @Document("clubs")
 @AllArgsConstructor
 @Getter

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

@@ -3,17 +3,16 @@
 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;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import moadong.club.enums.ApplicationStatus;
+import org.springframework.data.mongodb.core.mapping.Document;
 
 @Document("club_applications")
 @AllArgsConstructor

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

@@ -3,13 +3,12 @@
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import moadong.club.enums.ClubApplicationQuestionType;
 
-import java.util.List;
-
 @AllArgsConstructor
 @Getter
 @Builder(toBuilder = true)

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

@@ -1,22 +1,19 @@
 package moadong.club.entity;
 
 import jakarta.persistence.Id;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
-import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.domain.Persistable;
 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