Merge pull request #6 from AlongTheBlue/develop

Resturant 정리

Author: yeilkk

build.gradle

@@ -33,6 +33,17 @@ dependencies {
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4'
 	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+  
+  // 데이터 합치기
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
+
+	// Spring WebFlux 의존성 (WebClient 포함)
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+	// JSON 파싱을 위한 의존성
+	implementation 'org.json:json:20240303'
+	testImplementation 'io.projectreactor:reactor-test'
+	implementation 'io.netty:netty-resolver-dns-native-macos:4.1.86.Final:osx-x86_64'
 }
 
 tasks.named('test') {

src/main/java/org/alongtheblue/alongtheblue_server/AlongTheBlueServerApplication.java

@@ -1,8 +1,12 @@
 package org.alongtheblue.alongtheblue_server;
 
+import org.alongtheblue.alongtheblue_server.global.data.tourData.TourData;
+import org.alongtheblue.alongtheblue_server.global.data.tourData.TourDataService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.ArrayList;
+
 @SpringBootApplication
 public class AlongTheBlueServerApplication {
 

src/main/java/org/alongtheblue/alongtheblue_server/global/data/accommodation/Accommodation.java

@@ -0,0 +1,28 @@
+package org.alongtheblue.alongtheblue_server.global.data.accommodation;
+
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.TourImage;
+
+import java.util.List;
+
+@Entity
+@Data
+public class Accommodation {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String contentsid;
+    private String title;
+    private String roadaddress;
+    @Column(columnDefinition = "TEXT")
+    private String introduction;
+    private String infocenter;
+    private String checkintime;
+
+    @OneToMany(mappedBy = "accommodation", cascade = CascadeType.ALL)
+    @JsonManagedReference
+    private List<AccommodationImage> accommodationImage;
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/accommodation/AccommodationController.java

@@ -0,0 +1,97 @@
+package org.alongtheblue.alongtheblue_server.global.data.accommodation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/accommodation")
+public class AccommodationController {
+    @Autowired
+    private AccommodationService accommodationService;
+
+    // visit jeju
+    @GetMapping("/fetch-and-save")
+    public String fetchAndSaveAccommodations() {
+        accommodationService.saveAccommodations();
+        return "Data fetched and saved successfully!";
+    }
+
+//    @GetMapping("/overview")
+//    public String fetchANdUpdateOverview() {
+//        accommodationService.updateOverview();
+//        return "Data fetched and saved successfully";
+//    }
+
+    @GetMapping("/update")
+    public ResponseEntity<String> updateAccommodationInfo() {
+        accommodationService.updateOverview();
+        return ResponseEntity.ok("Accommodation info updated successfully.");
+    }
+
+    @GetMapping("/home")
+    public List<AccommodationDTO> getAccommodation(){
+        return accommodationService.getAccommodationHomeInfo();
+    }
+
+
+    @GetMapping("/overview/1")
+    public void updateOverview() {
+
+        accommodationService.updateFirstOverviews();
+    }
+
+    @GetMapping("/overview/all")
+    public void updateAllOverview() {
+
+        accommodationService.updateAllOverviews();
+    }
+
+    @GetMapping("/checkintime")
+    public void updateCheckInTimes(){
+
+        accommodationService.updateCheckInTimes();
+    }
+
+    @GetMapping("/infocenter")
+    public void updateInfoCenter(){
+
+        accommodationService.updateInfoCenterLodgings();
+    }
+
+    @GetMapping("/imgurl")
+    public void updateImgUrl(){
+
+        accommodationService.updateAllOriginImageUrls();
+    }
+
+    @GetMapping("/{contentsid}") // 상세보기
+    public AccommodationDTO getAccommodation(@PathVariable String contentsid) {
+        return accommodationService.getAccommodationDetails(contentsid);
+    }
+
+    @GetMapping("/random") // 홈화면
+    public ResponseEntity<List<AccommodationDTO>> getRandomAccommodationsWithImages() {
+        List<AccommodationDTO> randomAccommodations = accommodationService.getRandomAccommodationDetailsWithImages();
+
+        if (randomAccommodations.isEmpty()) {
+            // 만약 결과가 없다면 404 Not Found 리턴
+            return ResponseEntity.notFound().build();
+        }
+
+        // 성공적으로 데이터를 가져왔을 경우 200 OK와 함께 리스트 반환
+        return ResponseEntity.ok(randomAccommodations);
+    }
+
+    @GetMapping("/with-images") // 세부
+    public List<AccommodationDTO> getAccommodationsWithTwoImages() {
+        return accommodationService.getRandomAccommodationDetailsWithTwoImages();
+    }
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/accommodation/AccommodationDTO.java

@@ -0,0 +1,19 @@
+package org.alongtheblue.alongtheblue_server.global.data.accommodation;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class AccommodationDTO {
+    private String contentsid;
+    private String roadaddress;
+    private String title;
+    private List<String> originimgurl;  // 추가된 필드
+    private String introduction;  // 추가된 필드
+    private String checkintime;   // 추가된 필드
+    private String infocenter;
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/accommodation/AccommodationImage.java

@@ -0,0 +1,25 @@
+package org.alongtheblue.alongtheblue_server.global.data.accommodation;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.TourImage;
+import org.alongtheblue.alongtheblue_server.global.data.tourcommunity.TourPostItem;
+
+import java.util.List;
+
+@Entity
+@Data
+public class AccommodationImage {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+    private String url;
+
+    @ManyToOne
+    @JoinColumn(name = "Accommodation")
+    @JsonBackReference
+    private Accommodation accommodation;
+
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/accommodation/AccommodationImageRepository.java

@@ -0,0 +1,6 @@
+package org.alongtheblue.alongtheblue_server.global.data.accommodation;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface AccommodationImageRepository extends JpaRepository<AccommodationImage, Long> {
+}

src/main/java/org/alongtheblue/alongtheblue_server/global/data/accommodation/AccommodationRepository.java

@@ -0,0 +1,41 @@
+package org.alongtheblue.alongtheblue_server.global.data.accommodation;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Repository
+public interface AccommodationRepository extends JpaRepository<Accommodation, Long> {
+    List<Accommodation> findByIntroductionIsNull();
+    @Query("SELECT a FROM Accommodation a WHERE a.introduction IS NULL")
+    List<Accommodation> findAccommodationsWithNullIntroduction();
+    @Query("SELECT a.contentsid FROM Accommodation a")
+    List<String> findAllContentsIds();
+
+    Accommodation findByContentsid(String contentsid);
+
+    @Query(value = "SELECT a.* " +
+            "FROM accommodation a " +
+            "JOIN accommodation_image ai ON a.contentsid = ai.accommodation " +
+            "GROUP BY a.contentsid " +
+            "HAVING COUNT(ai.url) > 0 " +
+            "ORDER BY RAND() " +
+            "LIMIT 6",
+            nativeQuery = true)
+    List<Accommodation> findRandomAccommodationsWithImages();
+
+    @Query(value = "SELECT a.contentsid, a.roadaddress, a.title, "
+            + "(SELECT GROUP_CONCAT(ai.url SEPARATOR ',') FROM accommodation_image ai WHERE ai.accommodation = a.contentsid) as imageUrls, "
+            + "a.introduction "
+            + "FROM accommodation a "
+            + "JOIN accommodation_image ai ON a.contentsid = ai.accommodation "
+            + "GROUP BY a.contentsid "
+            + "HAVING COUNT(ai.url) > 0 "
+            + "ORDER BY RAND()", nativeQuery = true)
+    List<AccommodationDTO> findAccommodationsWithTwoImages();
+}
+