Fix horim

.gitignore

@@ -40,6 +40,7 @@ out/
 .vscode/
 
 mydb.db
+testdb.mv.db
 .env
 github-actions-key
 github-actions-key.pub

build.gradle

@@ -24,35 +24,45 @@ repositories {
 }
 
 dependencies {
+    // 기본 웹, 유효성 검사, Lombok
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'  // 추가
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
 
+    // 데이터베이스 (JPA, MySQL)
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'com.mysql:mysql-connector-j'
     implementation 'org.hibernate.orm:hibernate-community-dialects'
 
+    // 보안 (Spring Security)
     implementation 'org.springframework.boot:spring-boot-starter-security'
 
-    // JWT 관련 의존성 추가
+    // JWT (토큰)
     implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3'
 
     // test
     testImplementation 'io.rest-assured:rest-assured:5.5.0'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'io.rest-assured:rest-assured:5.5.0'
     runtimeOnly 'com.h2database:h2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
 
     // mqtt
     implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     implementation 'org.json:json:20240303'
+
+    // 1. .env 파일을 읽기 위한 라이브러리
+    implementation 'io.github.cdimascio:java-dotenv:5.2.2'
+
+    // 2. @EnableJpaAuditing을 사용하기 위한 Spring Data JPA
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
-}
+}

src/main/java/com/cagong/receiptpowerserver/ReceiptPowerServerApplication.java

@@ -1,13 +1,20 @@
+// ReceiptPowerServerApplication.java
+
 package com.cagong.receiptpowerserver;
 
+import io.github.cdimascio.dotenv.Dotenv; // import 추가
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@EnableJpaAuditing
 @SpringBootApplication
 public class ReceiptPowerServerApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(ReceiptPowerServerApplication.class, args);
-	}
-
-}
+    public static void main(String[] args) {
+        Dotenv.configure()
+                .ignoreIfMissing() // .env 파일이 없어도(예: 배포 환경) 오류 없이 통과
+                .systemProperties() // .env의 모든 변수를 System.setProperty()로 자동 등록
+                .load();
+        SpringApplication.run(ReceiptPowerServerApplication.class, args);
+    }
+}

src/main/java/com/cagong/receiptpowerserver/domain/cafe/Cafe.java

@@ -1,6 +1,7 @@
 package com.cagong.receiptpowerserver.domain.cafe;
 
 import com.cagong.receiptpowerserver.domain.cafe.dto.CafeRequest;
+import com.cagong.receiptpowerserver.domain.cafe.dto.CafeUpdateRequest;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -16,6 +17,9 @@ public class Cafe {
     @Column(name = "cafe_id")
     private Long id;
 
+    // [추가] 카카오 장소 ID를 저장할 필드. 카페가 중복 저장되는 것을 막는다.
+    @Column(unique = true)
+
     private String name;
 
     private String address;
@@ -27,15 +31,15 @@ public class Cafe {
     private String phoneNumber;
 
     @Builder
-    public Cafe(String name, String address, double latitude, double longitude, String phoneNumber) {
+    public Cafe(String name, double latitude, double longitude, String address, String phoneNumber) {
         this.name = name;
-        this.address = address;
         this.latitude = latitude;
-        this. longitude = longitude;
+        this.longitude = longitude;
+        this.address = address;
         this.phoneNumber = phoneNumber;
     }
 
-    public void updateFrom(CafeRequest request) {
+    public void update(CafeUpdateRequest request) {
         this.name = request.getCafeName();
         this.address = request.getAddress();
         this.latitude = request.getLatitude();

src/main/java/com/cagong/receiptpowerserver/domain/cafe/CafeController.java

@@ -2,61 +2,66 @@
 
 import com.cagong.receiptpowerserver.domain.cafe.dto.CafeRequest;
 import com.cagong.receiptpowerserver.domain.cafe.dto.CafeResponse;
+import com.cagong.receiptpowerserver.domain.cafe.dto.CafeUpdateRequest;
+import com.cagong.receiptpowerserver.domain.cafe.dto.CafeWithChatRoomsResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.net.URI;
 import java.util.List;
 
 @RestController
-@RequiredArgsConstructor
 @RequestMapping("/cafes")
+@RequiredArgsConstructor
 public class CafeController {
+
     private final CafeService cafeService;
+    /**
+     * 1. 카페 생성 (POST /api/cafes)
+     */
+    @PostMapping
+    public ResponseEntity<Long> createCafe(@RequestBody CafeRequest request) {
+        Long cafeId = cafeService.saveCafe(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(cafeId);
+    }
 
+    /**
+     * 2. 카페 전체 조회 (GET /api/cafes/all)
+     */
     @GetMapping("/all")
-    public ResponseEntity<List<CafeResponse>> getAllCafes(){
-        List<CafeResponse> responses = cafeService.getAllCafes();
-        return ResponseEntity.ok().body(responses);
+    public ResponseEntity<List<CafeResponse>> getAllCafes() {
+        List<CafeResponse> cafes = cafeService.findAllCafes();
+        return ResponseEntity.ok(cafes);
     }
 
+    /**
+     * 3. 카페 ID로 1건 조회 (GET /api/cafes/{cafeId})
+     */
     @GetMapping("/{cafeId}")
-    public ResponseEntity<CafeResponse> getCafeById(@PathVariable Long cafeId){
-        try{
-            CafeResponse response = cafeService.getCafeById(cafeId);
-            return ResponseEntity.ok().body(response);
-        } catch (IllegalArgumentException e){
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
-        }
+    public ResponseEntity<CafeResponse> getCafeById(@PathVariable Long cafeId) {
+        CafeResponse cafe = cafeService.findCafeById(cafeId);
+        return ResponseEntity.ok(cafe);
     }
 
-    @PostMapping
-    public ResponseEntity<Void> createCafe(@RequestBody CafeRequest request){
-        Long cafeId = cafeService.createCafe(request);
-        return ResponseEntity.created(URI.create("/cafes/" + cafeId)).build();
+    /**
+     * 4. 카페 삭제 (DELETE /api/cafes/{cafeId})
+     */
+    @DeleteMapping("/{cafeId}")
+    public ResponseEntity<Void> deleteCafe(@PathVariable Long cafeId) {
+        cafeService.deleteCafeById(cafeId);
+        return ResponseEntity.noContent().build(); // 204 No Content
     }
 
-    @PutMapping("/{cafeId}")
-    public ResponseEntity<Void> updateCafe (@PathVariable Long cafeId, @RequestBody CafeRequest request){
-        try {
-            cafeService.updateCafe(cafeId, request);
-            return ResponseEntity.ok().build();
-        } catch (IllegalArgumentException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
-        }
-    }
+    @PatchMapping("/{cafeId}")
+    public ResponseEntity<CafeResponse> updateCafe(
+            @PathVariable Long cafeId,
+            @RequestBody CafeUpdateRequest request) {
+
+        // 서비스의 updateCafe 메서드를 호출
+        CafeResponse updatedCafe = cafeService.updateCafe(cafeId, request);
 
-    @DeleteMapping("{cafeId}")
-    public ResponseEntity<Void> deleteCafe(@PathVariable Long cafeId){
-        try {
-            cafeService.deleteCafe(cafeId);
-            return ResponseEntity.noContent().build();
-        } catch (IllegalArgumentException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
-        }
+        // 수정된 정보(updatedCafe)를 클라이언트에게 200 OK와 함께 반환
+        return ResponseEntity.ok(updatedCafe);
     }
 }

src/main/java/com/cagong/receiptpowerserver/domain/cafe/CafeRepository.java

@@ -4,5 +4,4 @@
 
 import java.util.Optional;
 
-public interface CafeRepository extends JpaRepository<Cafe, Long> {
-}
+public interface CafeRepository extends JpaRepository<Cafe, Long> { }

src/main/java/com/cagong/receiptpowerserver/domain/cafe/CafeService.java

@@ -1,75 +1,87 @@
 package com.cagong.receiptpowerserver.domain.cafe;
 
 import com.cagong.receiptpowerserver.domain.cafe.dto.CafeRequest;
+import com.cagong.receiptpowerserver.domain.cafe.dto.CafeUpdateRequest; // [수정] 1. CafeUpdateRequest import
 import com.cagong.receiptpowerserver.domain.cafe.dto.CafeResponse;
+// [수정] 2. Kakao API 및 ChatRoomService 관련 의존성 *모두 삭제*
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
+
 @Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true)
 public class CafeService {
-    private final CafeRepository cafeRepository;
 
-    public List<CafeResponse> getAllCafes(){
-        return cafeRepository.findAll().stream()
-                .map(cafe -> new CafeResponse(
-                        cafe.getId(),
-                        cafe.getName(),
-                        cafe.getAddress(),
-                        cafe.getLatitude(),
-                        cafe.getLongitude(),
-                        cafe.getPhoneNumber()
-                        ))
-                .collect(Collectors.toList());
-    }
+    private final CafeRepository cafeRepository;
 
-    public CafeResponse getCafeById(Long cafeId){
-        return cafeRepository.findById(cafeId)
-                .map(cafe -> new CafeResponse(
-                        cafe.getId(),
-                        cafe.getName(),
-                        cafe.getAddress(),
-                        cafe.getLatitude(),
-                        cafe.getLongitude(),
-                        cafe.getPhoneNumber()
-                ))
-                .orElseThrow(() -> new IllegalArgumentException("해당 ID의 카페를 찾을 수 없습니다: " + cafeId));
-    }
+    // [수정] 3. ChatRoomService, RestTemplate, kakaoApiKey 의존성 *모두 삭제*
 
+    /**
+     * 1. 카페 생성 (POST /api/cafes)
+     */
     @Transactional
-    public Long createCafe(CafeRequest request){
+    public Long saveCafe(CafeRequest request) {
         Cafe cafe = Cafe.builder()
                 .name(request.getCafeName())
                 .address(request.getAddress())
                 .latitude(request.getLatitude())
                 .longitude(request.getLongitude())
                 .phoneNumber(request.getPhoneNumber())
                 .build();
-        Cafe saved = cafeRepository.save(cafe);
-        return saved.getId();
-    }
 
-    @Transactional
-    public void updateCafe(Long cafeId, CafeRequest request){
-        Cafe cafe = cafeRepository.findById(cafeId)
-                .orElseThrow(() -> new IllegalArgumentException("해당 ID의 카페를 찾을 수 없습니다: " + cafeId));
+        Cafe savedCafe = cafeRepository.save(cafe);
+        return savedCafe.getId();
+    }
 
-        cafe.updateFrom(request);
+    /**
+     * 2. 카페 전체 조회 (GET /api/cafes/all)
+     */
+    @Transactional(readOnly = true)
+    public List<CafeResponse> findAllCafes() {
+        return cafeRepository.findAll().stream()
+                .map(CafeResponse::new) // (CafeResponse(Cafe) 생성자 사용)
+                .collect(Collectors.toList());
+    }
 
-        cafeRepository.save(cafe);
+    /**
+     * 3. 카페 ID로 1건 조회 (GET /api/cafes/{cafeId})
+     */
+    @Transactional(readOnly = true)
+    public CafeResponse findCafeById(Long cafeId) {
+        Cafe cafe = cafeRepository.findById(cafeId)
+                .orElseThrow(() -> new RuntimeException("해당 ID의 카페를 조회할 수 없습니다:" + cafeId));
+        return new CafeResponse(cafe); // (CafeResponse(Cafe) 생성자 사용)
     }
 
+    /**
+     * 4. 카페 삭제 (DELETE /api/cafes/{cafeId})
+     */
     @Transactional
-    public void deleteCafe(Long cafeId){
-        if(!cafeRepository.existsById(cafeId)){
-            throw new IllegalArgumentException("해당 ID의 카페를 찾을 수 없습니다: " + cafeId);
-        }
-        cafeRepository.deleteById(cafeId);
+    public void deleteCafeById(Long cafeId) {
+        Cafe cafe = cafeRepository.findById(cafeId)
+                .orElseThrow(() -> new RuntimeException("해당 ID의 카페를 찾을 수 없습니다: " + cafeId));
+        cafeRepository.delete(cafe);
     }
-}
 
+    /**
+     * 5. 카페 수정
+     * */
+    @Transactional
+    public CafeResponse updateCafe(Long cafeId, CafeUpdateRequest request) {
+        // [수정] 4. updateCafe 로직을 올바르게 수정
+
+        // 1. DB에서 카페 Entity를 조회
+        Cafe cafe = cafeRepository.findById(cafeId)
+                .orElseThrow(() -> new RuntimeException("해당 ID의 카페를 찾을 수 없습니다: " + cafeId));
+
+        // 2. Entity의 update 메서드 호출 (JPA 변경 감지)
+        //    (이 코드가 작동하려면 Cafe.java에 update(CafeUpdateRequest request) 메서드가 있어야 합니다)
+        cafe.update(request);
+
+        // 3. 수정된 Entity를 DTO로 변환하여 반환
+        return new CafeResponse(cafe);
+    }
+}

src/main/java/com/cagong/receiptpowerserver/domain/cafe/dto/CafeRequest.java

@@ -6,9 +6,9 @@
 @Getter
 @AllArgsConstructor
 public class CafeRequest {
-    private String cafeName;
+    private String cafeName; // ❗️ 필드명 확인
     private String address;
     private double latitude;
     private double longitude;
     private String phoneNumber;
-}
+}