release: deploy push admin backend

.github/workflows/cd-dev.yml

@@ -1,6 +1,7 @@
 name: CI/CD using github actions & docker
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - develop
@@ -53,10 +54,6 @@ jobs:
     needs: push_to_registry
     runs-on: ubuntu-latest
     steps:
-      - name: Get Github action IP
-        id: ip
-        uses: haythem/public-ip@v1.2
-
       - name: Deploy to prod
         if: contains(github.ref, 'develop') || contains(github.ref, 'main')
         uses: appleboy/ssh-action@master

.github/workflows/cd.yml

@@ -56,10 +56,6 @@ jobs:
     needs: push_to_registry
     runs-on: ubuntu-latest
     steps:
-      - name: Get Github action IP
-        id: ip
-        uses: haythem/public-ip@v1.2
-
       - name: Deploy to prod
         if: contains(github.ref, 'develop') || contains(github.ref, 'main')
         uses: appleboy/ssh-action@master

.gitignore

@@ -44,3 +44,8 @@ out/
 ###claude###
 .claude
 .serena
+
+# Local-only config
+/src/main/resources/application-local.yml
+/.env.local
+/docker-compose.local.yml

src/main/java/devkor/com/teamcback/domain/ble/event/PlaceBecameVacantEvent.java

@@ -0,0 +1,10 @@
+package devkor.com.teamcback.domain.ble.event;
+
+import java.time.LocalDateTime;
+
+public record PlaceBecameVacantEvent(
+        Long placeId,
+        Long bleDataId,
+        LocalDateTime occurredAt
+) {
+}

src/main/java/devkor/com/teamcback/domain/ble/repository/BLEDataRepository.java

@@ -11,5 +11,6 @@
 
 public interface BLEDataRepository extends JpaRepository<BLEData, Long> {
     Optional<BLEData> findTopByDeviceOrderByLastTimeDesc(BLEDevice device);
+    Optional<BLEData> findTopByDeviceOrderByLastTimeDescIdDesc(BLEDevice device);
     List<BLEData> findAllByDeviceAndLastTimeBetweenOrderByLastTimeAsc(BLEDevice device, LocalDateTime start, LocalDateTime end);
 }

src/main/java/devkor/com/teamcback/domain/ble/service/BLEService.java

@@ -9,6 +9,7 @@
 import devkor.com.teamcback.domain.ble.entity.BLEData;
 import devkor.com.teamcback.domain.ble.entity.BLEDevice;
 import devkor.com.teamcback.domain.ble.entity.BLEstatus;
+import devkor.com.teamcback.domain.ble.event.PlaceBecameVacantEvent;
 import devkor.com.teamcback.domain.ble.repository.BLEDataRepository;
 import devkor.com.teamcback.domain.ble.repository.BLEDeviceRepository;
 import devkor.com.teamcback.domain.place.entity.Place;
@@ -17,6 +18,7 @@
 import devkor.com.teamcback.global.response.ResultCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -34,6 +36,7 @@ public class BLEService {
     private final BLEDeviceRepository bledeviceRepository;
     private final BLEDataRepository bleDataRepository;
     private final PlaceRepository placeRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
     // 평균 구해올 시간대 라벨
     private static final int[] TIME_SLOTS = {7, 10, 13, 16, 19, 22};
@@ -46,6 +49,11 @@ public class BLEService {
     @Transactional
     public UpdateBLERes updateBLE(UpdateBLEReq updateBLEReq) {
         BLEDevice bleDevice = bledeviceRepository.findByDeviceName(updateBLEReq.getDeviceName());
+        if (bleDevice == null) {
+            throw new GlobalException(ResultCode.NOT_FOUND_DEVICE_NAME);
+        }
+        BLEData previousData = bleDataRepository.findTopByDeviceOrderByLastTimeDescIdDesc(bleDevice)
+                .orElse(null);
         int capacity = bleDevice.getCapacity();
         int people = getBlEPeople(updateBLEReq.getLastCount(), bleDevice);
         double final_ratio = (double) people / capacity;
@@ -61,9 +69,29 @@ public UpdateBLERes updateBLE(UpdateBLEReq updateBLEReq) {
         bleData.setLastTime(updateBLEReq.getLastTime());
         bleDataRepository.save(bleData);
 
+        if (becameVacant(previousData, status) && bleDevice.getPlace() != null) {
+            eventPublisher.publishEvent(new PlaceBecameVacantEvent(
+                    bleDevice.getPlace().getId(),
+                    bleData.getId(),
+                    bleData.getLastTime()
+            ));
+        }
+
         return new UpdateBLERes(bleData);
     }
 
+    private boolean becameVacant(
+            BLEData previousData,
+            BLEstatus newStatus
+    ) {
+        if (!BLEstatus.VACANT.equals(newStatus) || previousData == null) {
+            return false;
+        }
+
+        return BLEstatus.AVAILABLE.equals(previousData.getLastStatus())
+                || BLEstatus.CROWDED.equals(previousData.getLastStatus());
+    }
+
     private int getBlEPeople(int lastCount, BLEDevice bleDevice) {
         if (bleDevice == null) throw new GlobalException(ResultCode.NOT_FOUND_DEVICE_NAME);
         double ratio = bleDevice.getRatio();

src/main/java/devkor/com/teamcback/domain/bookmark/repository/CategoryRepository.java

@@ -27,4 +27,15 @@ List<Category> findCategoriesByUserAndLocationTypeAndLocationId(
 
     @Query("SELECT c FROM Category c LEFT JOIN FETCH c.categoryBookmarkList WHERE c.user = :user")
     List<Category> findByUser(@Param("user") User user);
+
+    @Query("""
+        SELECT DISTINCT c.user.userId FROM CategoryBookmark cb
+        JOIN cb.category c
+        JOIN cb.bookmark b
+        WHERE c.user IS NOT NULL AND b.locationType = :locationType AND b.locationId = :locationId
+        """)
+    List<Long> findDistinctUserIdsByLocationTypeAndLocationId(
+        @Param("locationType") LocationType locationType,
+        @Param("locationId") Long locationId
+    );
 }

src/main/java/devkor/com/teamcback/domain/character/controller/AdminStoreController.java

@@ -0,0 +1,124 @@
+package devkor.com.teamcback.domain.character.controller;
+
+import devkor.com.teamcback.domain.character.dto.request.CreateCharacterReq;
+import devkor.com.teamcback.domain.character.dto.request.ModifyCharacterReq;
+import devkor.com.teamcback.domain.character.dto.response.CreateCharacterRes;
+import devkor.com.teamcback.domain.character.dto.response.DeleteCharacterRes;
+import devkor.com.teamcback.domain.character.dto.response.GetAdminCharacterListRes;
+import devkor.com.teamcback.domain.character.dto.response.GrantCharacterRes;
+import devkor.com.teamcback.domain.character.dto.response.ModifyCharacterRes;
+import devkor.com.teamcback.domain.character.service.AdminStoreService;
+import devkor.com.teamcback.global.response.CommonResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/admin/store")
+public class AdminStoreController {
+    private final AdminStoreService adminStoreService;
+
+    /**
+     * 캐릭터 목록 조회 (비활성 포함)
+     */
+    @Operation(summary = "관리자 캐릭터 목록 조회", description = "비활성 캐릭터를 포함한 전체 캐릭터 조회")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+    })
+    @GetMapping("")
+    public CommonResponse<GetAdminCharacterListRes> getCharacterList() {
+        return CommonResponse.success(adminStoreService.getCharacterList());
+    }
+
+    /**
+     * 캐릭터 생성
+     * @param req 캐릭터 정보 (이미지, 가격 포함)
+     */
+    @Operation(summary = "캐릭터 생성", description = "캐릭터 생성 (이미지 필수, 가격은 0 이상의 포인트)")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "400", description = "잘못된 입력",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @PostMapping(value = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public CommonResponse<CreateCharacterRes> createCharacter(
+        @Parameter(description = "캐릭터 정보")
+        @ModelAttribute CreateCharacterReq req) {
+        return CommonResponse.success(adminStoreService.createCharacter(req));
+    }
+
+    /**
+     * 캐릭터 수정
+     * @param characterId 캐릭터 ID
+     * @param req 캐릭터 정보 (이미지 미첨부 시 기존 이미지 유지)
+     */
+    @Operation(summary = "캐릭터 수정", description = "캐릭터 수정 (이미지 미첨부 시 기존 이미지 유지)")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @PutMapping(value = "/{characterId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public CommonResponse<ModifyCharacterRes> modifyCharacter(
+        @Parameter(description = "캐릭터 ID", example = "1")
+        @PathVariable(name = "characterId") Long characterId,
+        @Parameter(description = "캐릭터 정보")
+        @ModelAttribute ModifyCharacterReq req) {
+        return CommonResponse.success(adminStoreService.modifyCharacter(characterId, req));
+    }
+
+    /**
+     * 캐릭터 삭제
+     * @param characterId 캐릭터 ID
+     */
+    @Operation(summary = "캐릭터 삭제", description = "캐릭터 삭제 (구매한 사용자가 있으면 삭제 불가, isActive=false로 숨김 처리 권장)")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+        @ApiResponse(responseCode = "409", description = "구매한 사용자가 있는 캐릭터",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @DeleteMapping("/{characterId}")
+    public CommonResponse<DeleteCharacterRes> deleteCharacter(
+        @Parameter(description = "캐릭터 ID", example = "1")
+        @PathVariable(name = "characterId") Long characterId) {
+        return CommonResponse.success(adminStoreService.deleteCharacter(characterId));
+    }
+
+    /**
+     * 캐릭터 수동 지급
+     * @param characterId 캐릭터 ID
+     * @param userId 사용자 ID
+     */
+    @Operation(summary = "캐릭터 수동 지급", description = "특정 사용자에게 캐릭터 지급 (이벤트 보상용, 포인트 차감 없음)")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+        @ApiResponse(responseCode = "409", description = "이미 보유한 캐릭터",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @PostMapping("/{characterId}/grant/{userId}")
+    public CommonResponse<GrantCharacterRes> grantCharacter(
+        @Parameter(description = "캐릭터 ID", example = "1")
+        @PathVariable(name = "characterId") Long characterId,
+        @Parameter(description = "사용자 ID", example = "1")
+        @PathVariable(name = "userId") Long userId) {
+        return CommonResponse.success(adminStoreService.grantCharacter(characterId, userId));
+    }
+}

src/main/java/devkor/com/teamcback/domain/character/controller/StoreController.java

@@ -0,0 +1,129 @@
+package devkor.com.teamcback.domain.character.controller;
+
+import devkor.com.teamcback.domain.character.dto.response.EquipCharacterRes;
+import devkor.com.teamcback.domain.character.dto.response.GetMyCharacterListRes;
+import devkor.com.teamcback.domain.character.dto.response.GetStoreRes;
+import devkor.com.teamcback.domain.character.dto.response.PurchaseCharacterRes;
+import devkor.com.teamcback.domain.character.dto.response.UnequipCharacterRes;
+import devkor.com.teamcback.domain.character.service.StoreService;
+import devkor.com.teamcback.global.response.CommonResponse;
+import devkor.com.teamcback.global.security.UserDetailsImpl;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/store")
+public class StoreController {
+    private final StoreService storeService;
+
+    /**
+     * 스토어 조회 (보유 포인트 + 캐릭터 목록)
+     * @param userDetail 사용자 정보
+     */
+    @Operation(summary = "스토어 조회", description = "보유 포인트와 전체 캐릭터 목록(보유/구매 가능/포인트 부족) 조회")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @GetMapping("")
+    public CommonResponse<GetStoreRes> getStore(
+        @Parameter(description = "사용자 정보")
+        @AuthenticationPrincipal UserDetailsImpl userDetail) {
+        return CommonResponse.success(storeService.getStore(userDetail.getUser().getUserId()));
+    }
+
+    /**
+     * 내 보유 캐릭터 목록 조회
+     * @param userDetail 사용자 정보
+     */
+    @Operation(summary = "보유 캐릭터 목록 조회", description = "보유 포인트, 구매한 캐릭터, 대표 장착 캐릭터 조회")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @GetMapping("/my")
+    public CommonResponse<GetMyCharacterListRes> getMyCharacters(
+        @Parameter(description = "사용자 정보")
+        @AuthenticationPrincipal UserDetailsImpl userDetail) {
+        return CommonResponse.success(storeService.getMyCharacters(userDetail.getUser().getUserId()));
+    }
+
+    /**
+     * 캐릭터 구매
+     * @param userDetail 사용자 정보
+     * @param characterId 캐릭터 ID
+     */
+    @Operation(summary = "캐릭터 구매", description = "보유 포인트를 차감하여 캐릭터 구매")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "400", description = "포인트 부족 또는 비활성 캐릭터",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+        @ApiResponse(responseCode = "409", description = "이미 보유한 캐릭터",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @PostMapping("/{characterId}/purchase")
+    public CommonResponse<PurchaseCharacterRes> purchaseCharacter(
+        @Parameter(description = "사용자 정보")
+        @AuthenticationPrincipal UserDetailsImpl userDetail,
+        @Parameter(description = "캐릭터 ID", example = "1")
+        @PathVariable(name = "characterId") Long characterId) {
+        return CommonResponse.success(storeService.purchaseCharacter(userDetail.getUser().getUserId(), characterId));
+    }
+
+    /**
+     * 대표 캐릭터 장착
+     * @param userDetail 사용자 정보
+     * @param characterId 캐릭터 ID
+     */
+    @Operation(summary = "대표 캐릭터 장착", description = "구매한 캐릭터를 대표 캐릭터로 장착")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "400", description = "보유하지 않은 캐릭터",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @PutMapping("/{characterId}/equip")
+    public CommonResponse<EquipCharacterRes> equipCharacter(
+        @Parameter(description = "사용자 정보")
+        @AuthenticationPrincipal UserDetailsImpl userDetail,
+        @Parameter(description = "캐릭터 ID", example = "1")
+        @PathVariable(name = "characterId") Long characterId) {
+        return CommonResponse.success(storeService.equipCharacter(userDetail.getUser().getUserId(), characterId));
+    }
+
+    /**
+     * 대표 캐릭터 장착 해제
+     * @param userDetail 사용자 정보
+     */
+    @Operation(summary = "대표 캐릭터 장착 해제", description = "대표 캐릭터 장착 해제")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "정상 처리 되었습니다."),
+        @ApiResponse(responseCode = "404", description = "Not Found",
+            content = @Content(schema = @Schema(implementation = CommonResponse.class))),
+    })
+    @DeleteMapping("/equip")
+    public CommonResponse<UnequipCharacterRes> unequipCharacter(
+        @Parameter(description = "사용자 정보")
+        @AuthenticationPrincipal UserDetailsImpl userDetail) {
+        return CommonResponse.success(storeService.unequipCharacter(userDetail.getUser().getUserId()));
+    }
+}