Merge pull request #194 from Open-Eye-Im-Developer/develop

[MERGE] main에 develop 반영
Open-Eye-Im-Developer · Feb 28, 2024 · 49a33e6 · 49a33e6
2 parents ca0a17a + 73c5f74
commit 49a33e6
Show file tree

Hide file tree

Showing 48 changed files with 861 additions and 115 deletions.
diff --git a/src/main/java/io/oeid/mogakgo/common/swagger/template/ChatSwagger.java b/src/main/java/io/oeid/mogakgo/common/swagger/template/ChatSwagger.java
@@ -2,14 +2,18 @@
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
+import io.oeid.mogakgo.common.base.CursorPaginationInfoReq;
+import io.oeid.mogakgo.common.base.CursorPaginationResult;
 import io.oeid.mogakgo.core.properties.swagger.error.SwaggerChatErrorExamples;
 import io.oeid.mogakgo.core.properties.swagger.error.SwaggerProjectErrorExamples;
 import io.oeid.mogakgo.core.properties.swagger.error.SwaggerUserErrorExamples;
+import io.oeid.mogakgo.domain.chat.application.dto.res.ChatDataRes;
 import io.oeid.mogakgo.domain.chat.application.dto.res.ChatRoomDataRes;
 import io.oeid.mogakgo.domain.chat.application.dto.res.ChatRoomPublicRes;
 import io.oeid.mogakgo.exception.dto.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -28,28 +32,52 @@ public interface ChatSwagger {
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "채팅방 목록 조회 성공"),
         @ApiResponse(responseCode = "404", description = "요청한 유저가 존재하지 않음",
-        content = @Content(
-            mediaType = APPLICATION_JSON_VALUE,
-            schema = @Schema(implementation = ErrorResponse.class),
-            examples = @ExampleObject(name = "E020301", value =  SwaggerUserErrorExamples.USER_NOT_FOUND)
-        ))
+            content = @Content(
+                mediaType = APPLICATION_JSON_VALUE,
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND)
+            ))
     })
     ResponseEntity<List<ChatRoomPublicRes>> getChatRoomList(@Parameter(hidden = true) Long userId);
 
     @Operation(summary = "채팅방 상세 조회", description = "채팅방의 상세 정보를 조회하는 API")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "채팅방 상세 조회 성공"),
         @ApiResponse(responseCode = "404", description = "요청한 데이터가 유효하지 않음",
-        content = @Content(
-            mediaType = APPLICATION_JSON_VALUE,
-            schema = @Schema(implementation = ErrorResponse.class),
-            examples = {
-                @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND),
-                @ExampleObject(name = "E030301", value = SwaggerProjectErrorExamples.PROJECT_NOT_FOUND),
-                @ExampleObject(name = "E110301", value = SwaggerChatErrorExamples.CHAT_ROOM_NOT_FOUND)
-            }
-        ))
+            content = @Content(
+                mediaType = APPLICATION_JSON_VALUE,
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = {
+                    @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND),
+                    @ExampleObject(name = "E030301", value = SwaggerProjectErrorExamples.PROJECT_NOT_FOUND),
+                    @ExampleObject(name = "E110301", value = SwaggerChatErrorExamples.CHAT_ROOM_NOT_FOUND)
+                }
+            ))
     })
-    ResponseEntity<ChatRoomDataRes> getChatRoomDetailData(@Parameter(hidden = true) Long userId,
+    ResponseEntity<ChatRoomDataRes> getChatRoomDetailData(
+        @Parameter(hidden = true) Long userId,
         @Parameter(in = ParameterIn.PATH) String chatRoomId);
+
+    @Operation(summary = "채팅 내용 조회", description = "채팅방의 채팅 내용을 조회하는 API")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "채팅 내용 조회 성공"),
+        @ApiResponse(responseCode = "404", description = "요청한 데이터가 유효하지 않음",
+            content = @Content(
+                mediaType = APPLICATION_JSON_VALUE,
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = {
+                    @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND),
+                    @ExampleObject(name = "E110301", value = SwaggerChatErrorExamples.CHAT_ROOM_NOT_FOUND)
+                }
+            ))
+    })
+    @Parameters({
+        @Parameter(name = "cursorId", description = "기준이 되는 커서 ID", example = "1"),
+        @Parameter(name = "pageSize", description = "요청할 데이터 크기", example = "5", required = true),
+        @Parameter(name = "sortOrder", description = "정렬 방향", example = "ASC"),
+    })
+    ResponseEntity<CursorPaginationResult<ChatDataRes>> getChatData(
+        @Parameter(in = ParameterIn.PATH) String chatRoomId,
+        @Parameter(hidden = true) Long userId,
+        @Parameter(hidden = true) CursorPaginationInfoReq pageable);
 }
diff --git a/src/main/java/io/oeid/mogakgo/common/swagger/template/ProjectSwagger.java b/src/main/java/io/oeid/mogakgo/common/swagger/template/ProjectSwagger.java
@@ -10,6 +10,7 @@
 import io.oeid.mogakgo.domain.project.presentation.dto.res.ProjectDetailAPIRes;
 import io.oeid.mogakgo.domain.project.presentation.dto.req.ProjectCreateReq;
 import io.oeid.mogakgo.domain.project.presentation.dto.res.ProjectIdRes;
+import io.oeid.mogakgo.domain.project.presentation.dto.res.ProjectInfoAPIRes;
 import io.oeid.mogakgo.domain.project_join_req.presentation.dto.res.projectJoinRequestRes;
 import io.oeid.mogakgo.exception.dto.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -179,4 +180,53 @@ ResponseEntity<CursorPaginationResult<projectJoinRequestRes>> getJoinRequest(
             content = @Content(schema = @Schema(implementation = ProjectDensityRankRes.class))),
     })
     ResponseEntity<ProjectDensityRankRes> getDensityRankProjects();
+
+    @Operation(summary = "사용자가 생성한 프로젝트 리스트 조회", description = "회원이 자신이 만든 프로젝트 리스트를 조회할 때 사용하는 API")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "프로젝트 리스트 조회 성공"),
+        @ApiResponse(responseCode = "403", description = "본인의 프로젝트 카드만 조회 할 수 있음.",
+            content = @Content(
+                mediaType = "application/json",
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = @ExampleObject(name = "E030101", value = SwaggerProjectErrorExamples.PROJECT_JOIN_REQUEST_FORBIDDEN_OPERATION))),
+        @ApiResponse(responseCode = "404", description = "요청한 데이터가 존재하지 않음",
+            content = @Content(
+                mediaType = "application/json",
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND)
+            ))
+    })
+    @Parameters({
+        @Parameter(name = "cursorId", description = "기준이 되는 커서 ID", example = "1"),
+        @Parameter(name = "pageSize", description = "요청할 데이터 크기", example = "5", required = true),
+        @Parameter(name = "sortOrder", description = "정렬 방향", example = "ASC"),
+    })
+    ResponseEntity<CursorPaginationResult<ProjectInfoAPIRes>> getProjectsByCreator(
+        @Parameter(hidden = true) Long userId,
+        @Parameter(description = "프로젝트를 생성한 사용자 ID", required = true) Long creatorId,
+        @Parameter(hidden = true) CursorPaginationInfoReq pageable
+    );
+
+    @Operation(summary = "사용자가 생성한 프로젝트 상세 정보 조회", description = "회원이 자신이 생성한 프로젝트의 상세 정보를 조회할 때 사용하는 API")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "프로젝트 조회 성공"),
+        @ApiResponse(responseCode = "403", description = "본인의 프로젝트 카드만 조회 할 수 있음.",
+            content = @Content(
+                mediaType = "application/json",
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = @ExampleObject(name = "E030101", value = SwaggerProjectErrorExamples.PROJECT_JOIN_REQUEST_FORBIDDEN_OPERATION))),
+        @ApiResponse(responseCode = "404", description = "요청한 데이터가 존재하지 않음",
+            content = @Content(
+                mediaType = "application/json",
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = {
+                    @ExampleObject(name = "E030301", value = SwaggerProjectErrorExamples.PROJECT_NOT_FOUND),
+                    @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND)
+                }))
+    })
+    ResponseEntity<ProjectDetailAPIRes> getById(
+        @Parameter(hidden = true) Long userId,
+        @Parameter(description = "조회하려는 프로젝트 ID", required = true) Long projectId,
+        @Parameter(description = "프로젝트 생성자 ID", required = true) Long id
+    );
 }
diff --git a/src/main/java/io/oeid/mogakgo/common/swagger/template/UserSwagger.java b/src/main/java/io/oeid/mogakgo/common/swagger/template/UserSwagger.java
@@ -3,6 +3,7 @@
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 import io.oeid.mogakgo.core.properties.swagger.error.SwaggerUserErrorExamples;
+import io.oeid.mogakgo.domain.user.application.dto.res.UserJandiRateRes;
 import io.oeid.mogakgo.domain.user.presentation.dto.req.UserSignUpApiReq;
 import io.oeid.mogakgo.domain.user.presentation.dto.req.UserUpdateApiReq;
 import io.oeid.mogakgo.domain.user.presentation.dto.res.UserDevelopLanguageApiRes;
@@ -13,6 +14,7 @@
 import io.oeid.mogakgo.exception.dto.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -109,5 +111,18 @@ ResponseEntity<List<UserDevelopLanguageApiRes>> userDevelopLanguageApi(
     })
     ResponseEntity<UserUpdateApiRes> userUpdateApi(@Parameter(hidden = true) Long userId,
         UserUpdateApiReq request);
+
+
+    @Operation(summary = "회원 잔디 점수 조회", description = "회원의 잔디 점수를 조회할 때 사용하는 API")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "회원 잔디 점수 조회 성공",
+            content = @Content(schema = @Schema(implementation = UserJandiRateRes.class))),
+        @ApiResponse(responseCode = "404", description = "해당 유저가 존재하지 않음",
+            content = @Content(
+                mediaType = APPLICATION_JSON_VALUE,
+                schema = @Schema(implementation = ErrorResponse.class),
+                examples = @ExampleObject(name = "E020301", value = SwaggerUserErrorExamples.USER_NOT_FOUND))),
+    })
+    ResponseEntity<UserJandiRateRes> userJandiRateApi(@Parameter(in = ParameterIn.PATH) Long userId);
 
 }
diff --git a/...omain/achievement/domain/Achievement.java → ...chievement/domain/entity/Achievement.java b/...omain/achievement/domain/Achievement.java → ...chievement/domain/entity/Achievement.java
@@ -1,6 +1,7 @@
-package io.oeid.mogakgo.domain.achievement.domain;
+package io.oeid.mogakgo.domain.achievement.domain.entity;
 
-import io.oeid.mogakgo.domain.achievement.domain.enums.AchievementType;
+import io.oeid.mogakgo.domain.achievement.domain.entity.enums.ActivityType;
+import io.oeid.mogakgo.domain.achievement.domain.entity.enums.RequirementType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -9,7 +10,6 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -33,16 +33,18 @@ public class Achievement {
     @Column(name = "img_url")
     private String imgUrl;
 
+    @Column(name = "progress_level")
+    private Integer progressLevel;
+
     @Enumerated(EnumType.STRING)
-    @Column(name = "type")
-    private AchievementType achievementType;
-
-    @Builder
-    private Achievement(String title, String description, String imgUrl,
-        AchievementType achievementType) {
-        this.title = title;
-        this.description = description;
-        this.imgUrl = imgUrl;
-        this.achievementType = achievementType;
-    }
+    @Column(name = "requirement_type")
+    private RequirementType requirementType;
+
+    @Column(name = "requirement_value")
+    private Integer requirementValue;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "activity_type")
+    private ActivityType activityType;
+
 }
diff --git a/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/UserAchievement.java b/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/UserAchievement.java
@@ -0,0 +1,51 @@
+package io.oeid.mogakgo.domain.achievement.domain.entity;
+
+import io.oeid.mogakgo.domain.user.domain.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Getter
+@Entity
+@Table(name = "user_achievement_tb")
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+@EntityListeners(AuditingEntityListener.class)
+public class UserAchievement {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "achievement_id")
+    private Achievement achievement;
+
+    // TODO: 필요하면 개발하다가 추가
+//    @Column(name = "progress_count")
+//    private Integer progressCount;
+
+    @Column(name = "completed")
+    private Boolean completed;
+
+    @CreatedDate
+    @Column(name = "created_at")
+    private LocalDateTime createdAt;
+
+}
diff --git a/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/UserActivity.java b/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/UserActivity.java
@@ -0,0 +1,48 @@
+package io.oeid.mogakgo.domain.achievement.domain.entity;
+
+import io.oeid.mogakgo.domain.achievement.domain.entity.enums.ActivityType;
+import io.oeid.mogakgo.domain.user.domain.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Getter
+@Entity
+@Table(name = "user_activity_tb")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@EntityListeners(AuditingEntityListener.class)
+public class UserActivity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "activity_type")
+    private ActivityType activityType;
+
+    @CreatedDate
+    @Column(name = "created_at")
+    private LocalDateTime createdAt;
+
+}
diff --git a/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/enums/ActivityType.java b/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/enums/ActivityType.java
@@ -0,0 +1,31 @@
+package io.oeid.mogakgo.domain.achievement.domain.entity.enums;
+
+import java.util.List;
+import lombok.Getter;
+
+@Getter
+public enum ActivityType {
+
+    FROM_ONE_STEP(List.of(2, 3, 4)),
+    GOOD_PERSON_GOOD_MEETUP(List.of(5, 6, 7)),
+    LIKE_E(List.of(8, 9, 10)),
+    MY_DESTINY(List.of(11)),
+    CAPTURE_FAIL_EXIST(List.of(12)),
+    RUN_AWAY_FROM_MONSTAR_BALL(List.of(13)),
+    PLEASE_GIVE_ME_MOGAK(List.of(14, 15, 16)),
+    BRAVE_EXPLORER(List.of(17)),
+    NOMAD_CODER(List.of(18)),
+    CATCH_ME_IF_YOU_CAN(List.of(19, 20, 21)),
+    LEAVE_YOUR_MARK(List.of(22)),
+    WHAT_A_POPULAR_PERSON(List.of(23, 24, 25)),
+    CONTACT_WITH_GOD(List.of(26)),
+    FRESH_DEVELOPER(List.of(28, 29, 30)),
+    ;
+
+    private final List<Integer> includedDbIdList;
+
+    ActivityType(List<Integer> includedDbIdList) {
+        this.includedDbIdList = includedDbIdList;
+    }
+
+}
diff --git a/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/enums/RequirementType.java b/src/main/java/io/oeid/mogakgo/domain/achievement/domain/entity/enums/RequirementType.java
@@ -0,0 +1,8 @@
+package io.oeid.mogakgo.domain.achievement.domain.entity.enums;
+
+public enum RequirementType {
+    SEQUENCE,
+    ACCUMULATE,
+    ;
+
+}
diff --git a/src/main/java/io/oeid/mogakgo/domain/achievement/domain/enums/AchievementType.java b/src/main/java/io/oeid/mogakgo/domain/achievement/domain/enums/AchievementType.java
diff --git a/...main/java/io/oeid/mogakgo/domain/achievement/infrastructure/AchievementJpaRepository.java b/...main/java/io/oeid/mogakgo/domain/achievement/infrastructure/AchievementJpaRepository.java
@@ -1,10 +1,10 @@
 package io.oeid.mogakgo.domain.achievement.infrastructure;
 
-import io.oeid.mogakgo.domain.achievement.domain.Achievement;
+import io.oeid.mogakgo.domain.achievement.domain.entity.Achievement;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface AchievementJpaRepository extends JpaRepository<Achievement, Long> {
 
-}
+}