Merge branch 'main' into develop

main/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'org.sopt.makers.crew'
-version = '1.0.2'
+version = '1.1.0'
 
 java {
     sourceCompatibility = '17'

main/src/main/java/org/sopt/makers/crew/main/common/config/SecurityConfig.java

@@ -97,4 +97,4 @@ CorsConfigurationSource corsConfigurationSource() {
     return source;
   }
 
-}
+}

main/src/main/java/org/sopt/makers/crew/main/common/config/SwaggerConfig.java

@@ -21,7 +21,7 @@ public OpenAPI openAPI() {
 
                 Info info = new Info()
                                 .title("Crew API 문서")
-                                .version("1.0.2")
+                                .version("1.1.0")
                                 .description("Crew API 문서");
 
                 String jwtSchemeName = "JWT Authorization";
@@ -39,4 +39,4 @@ public OpenAPI openAPI() {
                                 .addSecurityItem(securityRequirement)
                                 .components(components);
         }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/apply/ApplyRepository.java

@@ -14,4 +14,4 @@ List<Apply> findAllByUserIdAndStatus(@Param("userId") Integer userId,
 
   List<Apply> findAllByMeetingIdAndStatus(Integer meetingId, EnApplyStatus statusValue);
 
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/meeting/Meeting.java

@@ -235,4 +235,4 @@ public Integer getMeetingStatus() {
       return EnMeetingStatus.RECRUITMENT_COMPLETE.getValue();
     }
   }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/meeting/MeetingRepository.java

@@ -17,4 +17,4 @@ default Meeting findByIdOrThrow(Integer meetingId) {
     return findById(meetingId)
         .orElseThrow(() -> new BadRequestException(NOT_FOUND_MEETING.getErrorCode()));
   }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/meeting/enums/MeetingCategory.java

@@ -27,4 +27,4 @@ public static MeetingCategory ofValue(String dbData) {
   public String getValue() {
     return value;
   }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/meeting/vo/ImageUrlVO.java

@@ -9,4 +9,4 @@ public class ImageUrlVO {
 
   private Integer id;
   private String url;
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/post/Post.java

@@ -162,4 +162,4 @@ public void addComment(Comment comment) {
   public void addReport(Report report) {
     this.reports.add(report);
   }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/user/UserRepository.java

@@ -20,4 +20,4 @@ default User findByOrgIdOrThrow(Integer orgUserId) {
         () -> new NoContentException(
             NO_CONTENT_EXCEPTION.getErrorCode())); //유저가 아직 모임 서비스를 이용 전이기 때문에
   }
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/user/vo/UserActivityVO.java

@@ -12,4 +12,4 @@ public class UserActivityVO {
   private String part;
   private int generation;
 
-}
+}

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sopt_web_product_server",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "",
   "author": "",
   "private": true,

server/src/common/utils/swagger.ts

@@ -12,7 +12,7 @@ export function setupSwagger(app: INestApplication): void {
   const options = new DocumentBuilder()
     .setTitle('Crew API 문서')
     .setDescription('Crew API 문서')
-    .setVersion('1.0.2')
+    .setVersion('1.1.0')
     .addBearerAuth()
     .build();