#62 [FEAT, FIX] Feature/edit group 그룹 api 수정 및 개발

src/main/java/com/wakeUpTogetUp/togetUp/api/alarm/AlarmRepository.java

@@ -41,6 +41,8 @@ public interface AlarmRepository extends JpaRepository<Alarm, Integer> {
     List<Alarm> findAllByRoomIds(@Param("roomIds") List<Integer> roomIds);
 
 
+    @Query("SELECT a FROM Alarm a WHERE a.room.invitationCode = :invitationCode")
+    Optional<Alarm> findByInvitationCode(@Param("invitationCode") String invitationCode);
 
 
 

src/main/java/com/wakeUpTogetUp/togetUp/api/room/RoomController.java

@@ -5,6 +5,7 @@
 import com.wakeUpTogetUp.togetUp.api.room.dto.request.RoomUserLogMissionReq;
 import com.wakeUpTogetUp.togetUp.api.room.dto.request.RoomReq;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomDetailRes;
+import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomInfoRes;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomUserMissionLogRes;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomRes;
 import com.wakeUpTogetUp.togetUp.common.dto.BaseResponse;
@@ -101,7 +102,7 @@ public BaseResponse changeRoomHost(@Parameter(hidden = true) @AuthUser Integer u
 
     }
 
-    @Operation(summary = "그룹 디테일 보기 and 초대 받은 사람에게 보이는 그룹 정보 보기 ",description = "그룹 디테일 보기 (설정 화면) and 초대 받은 사람에게 보이는 앱 내 페이지")
+    @Operation(summary = "그룹 디테일 보기 ",description = "그룹 디테일 보기 (설정 화면)")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "요청에 성공하였습니다.",
                     content = @Content(schema = @Schema(implementation = RoomDetailRes.class))),
@@ -141,6 +142,22 @@ public BaseResponse joinRoom(@Parameter(hidden = true) @AuthUser Integer  invite
 
     }
 
+    @Operation(summary = "초대 받은 사람에게 보이는 그룹 정보 보기 ",description = "초대 받은 사람에게 보이는 앱 내 페이지")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "요청에 성공하였습니다.",
+                    content = @Content(schema = @Schema(implementation = RoomInfoRes.class))),
+            @ApiResponse(responseCode = "404" , description = "존재하지 않는 알람 입니다."),
+            @ApiResponse(responseCode = "404", description = "존재하지 않는 룸입니다.")
+    })
+    @GetMapping("/information")
+    public BaseResponse<RoomInfoRes> getRoomIntro(@RequestParam() String invitationCode) {
+
+
+        return new BaseResponse(Status.SUCCESS,roomService.getRoomInformation(invitationCode));
+
+    }
+
+
 
 
 }

src/main/java/com/wakeUpTogetUp/togetUp/api/room/RoomService.java

@@ -7,6 +7,7 @@
 import com.wakeUpTogetUp.togetUp.api.mission.model.MissionLog;
 import com.wakeUpTogetUp.togetUp.api.room.dto.request.RoomReq;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomDetailRes;
+import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomInfoRes;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomRes;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomUserMissionLogRes;
 import com.wakeUpTogetUp.togetUp.api.room.model.Room;
@@ -20,12 +21,15 @@
 import com.wakeUpTogetUp.togetUp.exception.BaseException;
 import com.wakeUpTogetUp.togetUp.utils.TimeFormatter;
 import com.wakeUpTogetUp.togetUp.utils.mapper.EntityDtoMapper;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,7 +90,7 @@ public List<RoomRes> getRoomList(Integer userId) {
 
 
     public RoomUserMissionLogRes getRoomUserLogList(Integer userId, Integer roomId,
-            String localDateTimeString) {
+                                                    String localDateTimeString) {
 
         LocalDateTime localDateTime = timeFormatter.stringToLocalDateTime(localDateTimeString);
         List<RoomUser> roomUserList = roomUserRepository.findAllByRoom_IdOrderByPreference(roomId,
@@ -116,7 +120,7 @@ public RoomUserMissionLogRes getRoomUserLogList(Integer userId, Integer roomId,
     }
 
     public RoomUserMissionLogRes setUserLogData(RoomUserMissionLogRes roomUserMissionLogRes,
-            Integer userId, Integer roomId, LocalDateTime localDateTime) {
+                                                Integer userId, Integer roomId, LocalDateTime localDateTime) {
 
         boolean isAlarmActive = alarmRepository.findFirstByRoom_Id(roomId)
                 .getDayOfWeekValue(localDateTime.getDayOfWeek());
@@ -191,23 +195,25 @@ public RoomUserMissionLogRes setUserLogData(RoomUserMissionLogRes roomUserMissio
     public void changeRoomHost(Integer roomId, Integer userId, Integer selectedUserId) {
 
         //host false로 바꾸기
-        RoomUser roomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, userId);
+        RoomUser roomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, userId)
+                .orElseThrow(() -> new BaseException(Status.ROOM_USER_NOT_FOUND));
         if (!roomUser.getIsHost()) {
             throw new BaseException(Status.INVALID_ROOM_HOST_ID);
         }
         roomUser.setIsHost(false);
 
         //선택한 user를 host 지정
-        RoomUser seletedRoomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId,
-                selectedUserId);
+        RoomUser seletedRoomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, selectedUserId)
+                .orElseThrow(() -> new BaseException(Status.ROOM_USER_NOT_FOUND));
         seletedRoomUser.setIsHost(true);
 
     }
 
     @Transactional
     public void leaveRoom(Integer roomId, Integer userId) {
 
-        RoomUser roomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, userId);
+        RoomUser roomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, userId)
+                .orElseThrow(() -> new BaseException(Status.ROOM_USER_NOT_FOUND));
         if (Objects.isNull(roomUser)) {
             throw new BaseException(Status.ROOM_USER_NOT_FOUND);
         }
@@ -269,11 +275,10 @@ public RoomDetailRes getRoomDetail(Integer roomId, Integer userId) {
         roomDetailRes.setUserList(EntityDtoMapper.INSTANCE.toUserDataList(roomUsers));
 
         //dto 매핑 - 커스텀 필드
-
-        //아바타 세팅 (아바타 수정 이후 변경될 예정)
         this.setUserTheme(roomDetailRes);
         roomDetailRes.getRoomData().setCreatedAt(
                 timeFormatter.timestampToDotDateFormat(alarm.getRoom().getCreatedAt()));
+
         roomDetailRes.getRoomData().setPersonnel(roomUsers.size());
 
         // ex) 13:00 -> pm 1:00
@@ -290,11 +295,9 @@ public RoomDetailRes getRoomDetail(Integer roomId, Integer userId) {
 
     public void setUserTheme(RoomDetailRes roomDetailRes) {
 
-        //TODO 테이블 바뀌면 수정 해야함
-//        roomDetailRes.getUserList().forEach(userData ->  userData.setTheme(AvatarTheme.valueOf(userAvatarRepository.findByUser_Id(userData.getUserId()).getAvatar().getTheme()).getValue()));
         roomDetailRes.getUserList().forEach(userData -> userData.setTheme(
                 userAvatarRepository.findByUser_IdAndIsActiveIsTrue(userData.getUserId())
-                        .orElseThrow(() -> new BaseException(Status.INTERNAL_SERVER_ERROR))
+                        .orElseThrow(() -> new BaseException(Status.FIND_USER_AVATAR_FAIL))
                         .getAvatar().getTheme().getValue()));
 
     }
@@ -303,17 +306,20 @@ public void setUserTheme(RoomDetailRes roomDetailRes) {
     @Transactional
     public void updateAgreePush(Integer roomId, Integer userId, boolean agreePush) {
 
-        RoomUser roomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, userId);
-        if (Objects.isNull(roomUser)) {
-            throw new BaseException(Status.ROOM_USER_NOT_FOUND);
-        }
+        RoomUser roomUser = roomUserRepository.findByRoom_IdAndUser_Id(roomId, userId)
+                .orElseThrow(() -> new BaseException(Status.ROOM_USER_NOT_FOUND));
+
         roomUser.setAgreePush(agreePush);
 
     }
 
     @Transactional
     public void joinRoom(Integer roomId, Integer invitedUserId, boolean isHost) {
 
+        if (!isHost && roomUserRepository.existsRoomUserByRoom_IdAndUser_Id(roomId, invitedUserId)) {
+            throw new BaseException(Status.ROOM_USER_ALREADY_EXIST);
+        }
+
         User user = userRepository.findById(invitedUserId)
                 .orElseThrow(() -> new BaseException(Status.USER_NOT_FOUND));
 
@@ -332,4 +338,36 @@ public void joinRoom(Integer roomId, Integer invitedUserId, boolean isHost) {
         roomUserRepository.save(roomUser);
     }
 
+    public RoomInfoRes getRoomInformation(String invitationCode) {
+
+        Alarm alarm = alarmRepository.findByInvitationCode(invitationCode)
+                .orElseThrow(() -> new BaseException(Status.ALARM_NOT_FOUND));
+
+        Integer roomPersonnel = roomUserRepository.countByRoomId(alarm.getRoom().getId());
+        if (roomPersonnel < 1)
+            throw new BaseException(Status.ROOM_NOT_FOUND);
+
+        //dto 매핑 mapper 사용
+        RoomInfoRes roomInfoRes = new RoomInfoRes();
+        roomInfoRes.setRoomData(EntityDtoMapper.INSTANCE.toRoomInfoResRoomData(alarm));
+        roomInfoRes.setAlarmData(EntityDtoMapper.INSTANCE.toRoomInfoResAlarmData(alarm));
+
+        //dto 매핑 - 커스텀 필드
+        roomInfoRes.getRoomData().setCreatedAt(
+                timeFormatter.timestampToDotDateFormat(alarm.getRoom().getCreatedAt()));
+        roomInfoRes.getRoomData().setPersonnel(roomPersonnel);
+
+        // ex) 13:00 -> pm 1:00
+        roomInfoRes.getAlarmData()
+                .setAlarmTime(timeFormatter.timeStringToAMPMFormat(alarm.getAlarmTime()));
+
+        // ex)  평일, 주말, 매일, 월요일, (월, 화, 수), 빈칸
+        roomInfoRes.getAlarmData().setAlarmDay(
+                timeFormatter.formatDaysOfWeek(alarm.getMonday(), alarm.getTuesday(),
+                        alarm.getWednesday(), alarm.getThursday(), alarm.getFriday(),
+                        alarm.getSaturday(), alarm.getSunday()));
+
+        return roomInfoRes;
+    }
+
 }

src/main/java/com/wakeUpTogetUp/togetUp/api/room/RoomUserRepository.java

@@ -8,6 +8,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface RoomUserRepository extends JpaRepository<RoomUser, Integer> {
@@ -32,9 +33,13 @@ public interface RoomUserRepository extends JpaRepository<RoomUser, Integer> {
     List<Integer> findAllRoomIdsByUserId(@Param("userId") Integer userId);
 
     Integer countByUserId(Integer userId);
+
+    Integer countByRoomId(Integer roomId);
     void deleteByUserId(Integer userId);
 
-    RoomUser findByRoom_IdAndUser_Id(Integer roomId , Integer userId);
+    Optional<RoomUser> findByRoom_IdAndUser_Id(Integer roomId , Integer userId);
+
+    Boolean existsRoomUserByRoom_IdAndUser_Id(Integer roomId , Integer userId);
 
     void deleteByRoom_IdAndUser_Id(Integer roomId, Integer userId);
     List<RoomUser> findAllByRoom_IdOrderByCreatedAt(Integer roomId);

src/main/java/com/wakeUpTogetUp/togetUp/api/room/dto/response/RoomDetailRes.java

@@ -40,6 +40,9 @@ public static class RoomData {
         @Schema(description = "함께하는 인원수",example = "6")
         private Integer personnel;
 
+        @Schema(description = "룸 초대코드" ,example = "4c905")
+        private String invitationCode;
+
 
     }
 

src/main/java/com/wakeUpTogetUp/togetUp/api/room/dto/response/RoomInfoRes.java

@@ -0,0 +1,64 @@
+package com.wakeUpTogetUp.togetUp.api.room.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+
+@Schema(description = "룸정보 조회 요청 api 응답")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class RoomInfoRes {
+
+    @Schema(description = "룸 정보")
+    private RoomData roomData;
+
+    @Schema(description = "알람 정보")
+    private AlarmData alarmData;
+
+    @Builder
+    @Data
+    public static class RoomData {
+
+        @Schema(description = "룸아이디" ,example = "1")
+        private Integer id;
+
+        @Schema( description = "룸이 가지고 있는 알람의 아이콘",example = "⏰")
+        private String icon;
+
+        @Schema(description = "room name", example = "설여대 기상방")
+        private String name;
+
+        @Schema(description = "room 소개",example = "소프트웨어융학학과 기상방입니다.")
+        private String intro;
+
+        @Schema(description = "room 개설일",example = "2020.02.03")
+        private String createdAt;
+
+        @Schema(description = "함께하는 인원수",example = "6")
+        private Integer personnel;
+
+
+
+    }
+
+    @Builder
+    @Data
+    public static class AlarmData {
+
+        @Schema(description = "미션의 한국말",example = "자동차")
+        private String missionKr;
+
+        @Schema(description = "알람 시간", example = "pm 13:00")
+        private String alarmTime;
+
+        @Schema(description = "그룹알람 울리는 날",example = "주중")
+        private String alarmDay;
+
+
+    }
+
+
+}

src/main/java/com/wakeUpTogetUp/togetUp/api/room/model/Room.java

@@ -43,7 +43,7 @@ public class Room {
     /**
      * todo uuid
      */
-    @Column(name = "invitation_code",length = 50)
+    @Column(name = "invitation_code",length = 10)
     private String invitationCode;
 
    // @JsonIgnore

src/main/java/com/wakeUpTogetUp/togetUp/common/Status.java

@@ -49,7 +49,7 @@ public enum Status {
 
     // NOT FOUND
     USER_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 유저 입니다."),
-    ROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 room 입니다."),
+    ROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 방 입니다."),
     ALARM_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 알람 입니다."),
     MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 미션 입니다."),
     AVATAR_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 아바타 입니다."),
@@ -60,6 +60,7 @@ public enum Status {
 
     // CONFLICT
     USER_AVATAR_ALREADY_EXIST(HttpStatus.CONFLICT, "이미 보유한 아바타 입니다."),
+    ROOM_USER_ALREADY_EXIST(HttpStatus.CONFLICT, "이미 방에 들어간 멤버입니다."),
 
     // UNSUPPORTED MEDIA TYPE
     UNSUPPORTED_MEDIA_TYPE(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "지원하지 않는 파일 확장자 입니다."),

src/main/java/com/wakeUpTogetUp/togetUp/utils/mapper/EntityDtoMapper.java

@@ -13,6 +13,7 @@
 import com.wakeUpTogetUp.togetUp.api.mission.model.Mission;
 import com.wakeUpTogetUp.togetUp.api.mission.model.MissionLog;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomDetailRes;
+import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomInfoRes;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomUserMissionLogRes;
 import com.wakeUpTogetUp.togetUp.api.room.dto.response.RoomRes;
 import com.wakeUpTogetUp.togetUp.api.room.model.RoomUser;
@@ -88,6 +89,7 @@ public interface EntityDtoMapper {
     @Mapping(target = "icon", source = "icon")
     @Mapping(target = "name", source = "room.name")
     @Mapping(target = "intro", source = "room.intro")
+    @Mapping(target = "invitationCode", source = "room.invitationCode")
     RoomDetailRes.RoomData toRoomDetailResRoomData(Alarm alarm);
 
     @Mapping(target = "id", source = "id")
@@ -102,6 +104,17 @@ public interface EntityDtoMapper {
 
     List<RoomDetailRes.UserData> toUserDataList(List<RoomUser> roomUser);
 
+
+    @Mapping(target = "id", source = "room.id")
+    @Mapping(target = "icon", source = "icon")
+    @Mapping(target = "name", source = "room.name")
+    @Mapping(target = "intro", source = "room.intro")
+    RoomInfoRes.RoomData toRoomInfoResRoomData(Alarm alarm);
+
+
+    @Mapping(target = "missionKr", source = "missionObject.kr")
+    RoomInfoRes.AlarmData toRoomInfoResAlarmData(Alarm alarm);
+
     // Avatar
     @Mapping(source = "avatar.id", target = "avatarId")
     @Mapping(source = "avatar.theme.value", target = "theme")
@@ -116,4 +129,5 @@ default void setIsUnlockedStatus(@MappingTarget UserAvatarData target, Avatar av
         target.setIsUnlocked(userAvatarList.stream()
                 .anyMatch(userAvatar -> userAvatar.getAvatar().getId().equals(avatar.getId())));
     }
+
 }

src/main/resources/migration/data.sql

@@ -78,6 +78,6 @@ INSERT INTO mission_object (id, name, kr, icon, is_active, mission_id) VALUES (7
 
 
 -- 아바타 (임시)
-INSERT INTO togetup_local_cm.avatar (id, theme, price, unlock_level, created_at) VALUES (1, 'NOOB_CHICK', 0, 1, '2023-10-07 20:35:51');
-INSERT INTO togetup_local_cm.avatar (id, theme, price, unlock_level, created_at) VALUES (2, 'TWINKLING_TEDDY_BEAR', 1500, 15, '2023-10-21 03:24:06');
-INSERT INTO togetup_local_cm.avatar (id, theme, price, unlock_level, created_at) VALUES (3, 'CUTE_BUNNY', 1500, 30, '2023-10-21 03:24:06');
+INSERT INTO avatar (id, theme, price, unlock_level, created_at) VALUES (1, 'NOOB_CHICK', 0, 1, '2023-10-07 20:35:51');
+INSERT INTO avatar (id, theme, price, unlock_level, created_at) VALUES (2, 'TWINKLING_TEDDY_BEAR', 1500, 15, '2023-10-21 03:24:06');
+INSERT INTO avatar (id, theme, price, unlock_level, created_at) VALUES (3, 'CUTE_BUNNY', 1500, 30, '2023-10-21 03:24:06');

src/main/resources/migration/togetup-erd.sql

@@ -37,7 +37,7 @@ create table room
     name                   varchar(10)                          not null,
     intro                  varchar(30)                          null,
     topic                  varchar(100)                         null,
-    invitation_code        varchar(100)                         null,
+    invitation_code        varchar(10)                         null,
     created_at             timestamp  default CURRENT_TIMESTAMP not null,
     updated_at             timestamp  default CURRENT_TIMESTAMP not null on update CURRENT_TIMESTAMP,
     latest_completion_time timestamp                            null,

src/main/resources/migration/updates/202031102[room].sql

@@ -0,0 +1,3 @@
+--table : invitation_code 길이 10으로 수정
+alter table room
+    add invitation_code varchar(10) null;