서버 통합을 위한 설정 변경

.github/workflows/deploy.yml

@@ -8,7 +8,7 @@ on:
       - "backend/settings.gradle.kts"
       - "backend/Dockerfile"
     branches:
-      - main
+      - dev
 jobs:
   makeTagAndRelease:
     runs-on: ubuntu-latest

backend/docker-compose.yml

@@ -1,33 +1,17 @@
 version: '3.8'
 
 services:
-  mysql:
+  mysql-anidoc: # 서비스명을 DB 전용으로 명시
     image: mysql:8.0
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
       MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-
     command:
       --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     networks:
       - common
     ports:
-      - "3306:3306"
-
-  app1:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    depends_on:
-      - mysql
-    ports:
-      - "8080:8080"
-    networks:
-      - common
-
-networks:
-  common:
-    driver: bridge
+      - "3307:3306" # 타 프로젝트 DB와 충돌 방지

backend/src/main/java/com/petner/anidoc/AnidocApplication.java

@@ -4,12 +4,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+import java.util.TimeZone;
+
 @EnableJpaAuditing
 @SpringBootApplication
 public class AnidocApplication {
 
 	public static void main(String[] args) {
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
 		SpringApplication.run(AnidocApplication.class, args);
 	}
-
 }

backend/src/main/java/com/petner/anidoc/domain/user/notification/service/NotificationService.java

@@ -1,25 +1,19 @@
 package com.petner.anidoc.domain.user.notification.service;
 
 import com.petner.anidoc.domain.user.notification.dto.PetInfoDto;
-import com.petner.anidoc.domain.user.notification.dto.ReservationNotificationDto;
 import com.petner.anidoc.domain.user.notification.dto.VaccinationNotificationDto;
 import com.petner.anidoc.domain.user.notification.entity.Notification;
 import com.petner.anidoc.domain.user.notification.entity.NotificationType;
 import com.petner.anidoc.domain.user.notification.repository.NotificationRepository;
-import com.petner.anidoc.domain.user.notification.util.NotificationMessageUtil;
 import com.petner.anidoc.domain.user.notification.util.VaccinationNotificationHelper;
 import com.petner.anidoc.domain.user.user.entity.User;
-import com.petner.anidoc.domain.user.user.entity.UserRole;
 import com.petner.anidoc.domain.user.user.repository.UserRepository;
-import com.petner.anidoc.domain.vet.reservation.entity.Reservation;
-import com.petner.anidoc.domain.vet.reservation.entity.ReservationStatus;
 import com.petner.anidoc.domain.vet.reservation.repository.ReservationRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
@@ -196,3 +190,6 @@ public long getUnreadCount(Long userId) {
         return notificationRepository.countByUserIdAndIsReadFalse(userId);
     }
 }
+
+
+

backend/src/main/java/com/petner/anidoc/domain/user/notification/service/SseEmitters.java

@@ -54,7 +54,6 @@ public SseEmitter add(Long userId, SseEmitter emitter) {
             if (list != null) list.remove(emitter);
         });
 
-
         emitter.onError(e -> {
             List<SseEmitter> list = this.emitters.get(userId);
             if (list != null) list.remove(emitter);
@@ -118,7 +117,8 @@ public void noti(Long userId, String eventName, Object data) {
                 }catch (ClientAbortException e){
                     deadEmitters.add(emitter);
                 }catch (IOException e) {
-                    throw new RuntimeException(e);
+                    log.debug("SSE 연결 끊어짐 - userId: {}, 메시지: {}", userId, e.getMessage());
+                    deadEmitters.add(emitter);
                 }
             }
             userEmitters.removeAll(deadEmitters);

backend/src/main/java/com/petner/anidoc/domain/user/user/controller/AdminController.java

@@ -0,0 +1,60 @@
+package com.petner.anidoc.domain.user.user.controller;
+
+
+import com.petner.anidoc.domain.user.user.dto.UserResponseDto;
+import com.petner.anidoc.domain.user.user.service.UserService;
+import com.petner.anidoc.domain.user.user.service.UserStatusService;
+import com.petner.anidoc.global.security.SecurityUser;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Security;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admins")
+@RequiredArgsConstructor
+
+public class AdminController {
+
+    private final UserService userService;
+    private final UserStatusService userStatusService;
+
+    // ✅ 승인 대기 목록 조회
+    @Operation(summary = "승인 대기 목록 조회", description = "의료진 가입 승인 대기 중인 사용자 목록을 조회합니다.")
+    @GetMapping("/pending-approvals")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    public ResponseEntity<List<UserResponseDto>> getPendingApprovals(){
+        List<UserResponseDto> pendingUsers = userStatusService.getPendingApprovalUsers();
+        return ResponseEntity.ok(pendingUsers);
+    }
+
+    // ✅ 승인 완료 처리
+    @PostMapping("/approve/{id}")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    public ResponseEntity<String> approveUser(
+            @PathVariable Long id,
+            @AuthenticationPrincipal SecurityUser admin){
+
+        userStatusService.approveUser(id, admin.getId());
+        return ResponseEntity.ok("사용자 승인 완료");
+    }
+
+    // ✅ 승인 거절
+    @DeleteMapping("/reject/{id}")
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    public ResponseEntity<String> rejectUser(
+            @PathVariable Long id,
+            @AuthenticationPrincipal SecurityUser admin) {
+        userStatusService.rejectUser(id, admin.getId());
+        return ResponseEntity.ok("사용자 승인 거부");
+    }
+
+
+}
+
+

backend/src/main/java/com/petner/anidoc/domain/user/user/controller/UserController.java

@@ -15,6 +15,7 @@
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
@@ -99,7 +100,6 @@ public ResponseEntity<LoginResponseDto> login(@Valid @RequestBody LoginRequestDt
             throw new CustomException(ErrorCode.LOGIN_FAILED);
         }
 
-    // TODO : 에러 코드 세분화(USER가 존재하지 않습니다, 비밀번호가 다릅니다 등)
     }
 
 
@@ -111,6 +111,8 @@ public ResponseEntity<String> logout(@CookieValue(value = "accessToken", require
         if (accessToken == null || !authTokenService.isValid(accessToken)){
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("유효하지 않은 토큰입니다.");
         }
+
+
         userService.logout(accessToken);
 
 
@@ -151,7 +153,7 @@ public ResponseEntity<UserUpdateResponseDto> getUserProfile(@AuthenticationPrinc
 
 
     // ✅ 의료진 조회
-    @Operation(summary = "의료진 목록 조회", description = "근무 중인 의료진 목록을 조회합니다.")
+    @Operation(summary = "의료진 목록 조회", description = "의료진 목록을 조회합니다.")
     @GetMapping("/staff")
     public ResponseEntity<List<StaffResponseDto>> getStaffList(
             @RequestParam(value = "onlyAvailable", defaultValue = "false") boolean onlyAvailable) {
@@ -160,14 +162,13 @@ public ResponseEntity<List<StaffResponseDto>> getStaffList(
         return ResponseEntity.ok(staffList);
     }
 
-
     //✅ 비밀번호 일치 확인
     @PostMapping("/verify-password")
     public ResponseEntity<Map<String, Object>> verifyCurrentPassword(
             @RequestBody PasswordVerificationRequest request,
             @AuthenticationPrincipal SecurityUser securityUser) {
-            User user = userService.getUserById(securityUser.getId());
-            try {
+        User user = userService.getUserById(securityUser.getId());
+        try {
             boolean isValid = userService.verifyCurrentPassword(user, request.getPassword());
 
             Map<String, Object> response = new HashMap<>();
@@ -200,7 +201,7 @@ public ResponseEntity<UserStatus> getMyStatus(@AuthenticationPrincipal SecurityU
 
     @PutMapping("/me/status")
     public ResponseEntity<String> updateMyStatus(@AuthenticationPrincipal SecurityUser securityUser,
-                                                @RequestParam UserStatus status){
+                                                 @RequestParam UserStatus status){
         userService.updateMyStatus(securityUser.getId(),status);
         return ResponseEntity.ok("상태 변경이 반영되었습니다.");
     }

backend/src/main/java/com/petner/anidoc/domain/user/user/dto/StaffResponseDto.java

@@ -14,12 +14,16 @@
 public class StaffResponseDto {
     private Long id;
     private String name;
+    private String email;
+    private String phoneNumber;
     private UserStatus status;
 
     public static StaffResponseDto fromEntity(User user) {
         return StaffResponseDto.builder()
                 .id(user.getId())
                 .name(user.getName())
+                .email(user.getEmail())
+                .phoneNumber(user.getPhoneNumber())
                 .status(user.getStatus())
                 .build();
     }

backend/src/main/java/com/petner/anidoc/domain/user/user/entity/ApprovalStatus.java

@@ -0,0 +1,7 @@
+package com.petner.anidoc.domain.user.user.entity;
+
+public enum ApprovalStatus {
+    PENDING,    // 승인 대기
+    APPROVED,   // 승인됨
+    REJECTED    // 승인 거부
+}

backend/src/main/java/com/petner/anidoc/domain/user/user/entity/User.java

@@ -56,6 +56,10 @@ public class User extends BaseEntity implements UserDetails {
     @Column(name = "status")
     private UserStatus status;
 
+    @Enumerated(EnumType.STRING)
+    @Column(name ="approval_status")
+    private ApprovalStatus approvalStatus;
+
     @Enumerated(EnumType.STRING)
     @Column(name = "sso_provider")
     private SsoProvider ssoProvider;
@@ -133,4 +137,14 @@ public void updateRefreshToken(String refreshToken){
     public void updateStatus(UserStatus status) {
         this.status = status;
     }
+
+    public void updateBasicInfo(String name, String phoneNumber, String emergencyContact, UserRole role, VetInfo vetInfo) {
+        this.name = name;
+        this.phoneNumber = phoneNumber;
+        this.emergencyContact = emergencyContact;
+        this.role = role;
+        this.vetInfo = vetInfo;
+    }
+
+
 }

backend/src/main/java/com/petner/anidoc/domain/user/user/entity/UserStatus.java

@@ -1,5 +1,5 @@
 package com.petner.anidoc.domain.user.user.entity;
 
 public enum UserStatus {
-    ON_DUTY, AWAY,OFF
+    ON_DUTY, AWAY,OFFLINE
 }

backend/src/main/java/com/petner/anidoc/domain/user/user/repository/UserRepository.java

@@ -1,5 +1,6 @@
 package com.petner.anidoc.domain.user.user.repository;
 
+import com.petner.anidoc.domain.user.user.entity.ApprovalStatus;
 import com.petner.anidoc.domain.user.user.entity.User;
 import com.petner.anidoc.domain.user.user.entity.UserRole;
 import com.petner.anidoc.domain.user.user.entity.UserStatus;
@@ -25,20 +26,14 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Query("SELECT u FROM User u WHERE u.role = :role AND u.status = :status")
     List<User> findByRoleAndStatus(@Param("role") UserRole role, @Param("status") UserStatus status);
 
+    // 승인된 특정 역할의 사용자 조회
+    List<User> findByRoleAndApprovalStatus(UserRole role, ApprovalStatus approvalStatus);
+
+    // 승인된 특정 역할과 상태의 사용자 조회
+    List<User> findByRoleAndApprovalStatusAndStatus(UserRole role, ApprovalStatus approvalStatus, UserStatus status);
+
+    List<User> findByRoleAndApprovalStatusAndStatusIn(UserRole role, ApprovalStatus approvalStatus, List<UserStatus> statuses);
 
-    @Modifying
-    @Transactional
-    @Query("UPDATE User u SET u.name = :name, u.phoneNumber = :phoneNumber, " +
-            "u.emergencyContact = :emergencyContact," +
-            "u.role = :role, " +
-            " u.vetInfo = :vetInfo, u.updatedAt = CURRENT_TIMESTAMP " +
-            "WHERE u.id = :id")
-    void updateUserBasicInfo(@Param("id") Long id,
-                             @Param("name") String name,
-                             @Param("phoneNumber") String phoneNumber,
-                             @Param("emergencyContact") String emergencyContact,
-                             @Param("role") UserRole role,
-                             @Param("vetInfo") VetInfo vetInfo);
 }