diff --git a/server/build/classes/java/main/com/swdc/server/controller/PriceController.class b/server/build/classes/java/main/com/swdc/server/controller/PriceController.class index 1bb56eb..96c33da 100644 Binary files a/server/build/classes/java/main/com/swdc/server/controller/PriceController.class and b/server/build/classes/java/main/com/swdc/server/controller/PriceController.class differ diff --git a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Price$PriceBuilder.class b/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Price$PriceBuilder.class deleted file mode 100644 index d503bc4..0000000 Binary files a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Price$PriceBuilder.class and /dev/null differ diff --git a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Price.class b/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Price.class deleted file mode 100644 index d01bf33..0000000 Binary files a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Price.class and /dev/null differ diff --git a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Product.class b/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Product.class deleted file mode 100644 index 5ccfc4a..0000000 Binary files a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/Product.class and /dev/null differ diff --git a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/collection/CategoryCollection.class b/server/build/classes/java/main/com/swdc/server/domain/mongoDB/collection/CategoryCollection.class deleted file mode 100644 index 25c8ec9..0000000 Binary files a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/collection/CategoryCollection.class and /dev/null differ diff --git a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/collection/ProductCollection.class b/server/build/classes/java/main/com/swdc/server/domain/mongoDB/collection/ProductCollection.class deleted file mode 100644 index 1a564a8..0000000 Binary files a/server/build/classes/java/main/com/swdc/server/domain/mongoDB/collection/ProductCollection.class and /dev/null differ diff --git a/server/build/classes/java/main/com/swdc/server/service/PriceService.class b/server/build/classes/java/main/com/swdc/server/service/PriceService.class index 06e2b91..a1d8675 100644 Binary files a/server/build/classes/java/main/com/swdc/server/service/PriceService.class and b/server/build/classes/java/main/com/swdc/server/service/PriceService.class differ diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/PriceController.class.uniqueId0 b/server/build/tmp/compileJava/compileTransaction/stash-dir/PriceController.class.uniqueId0 index 1bb56eb..96c33da 100644 Binary files a/server/build/tmp/compileJava/compileTransaction/stash-dir/PriceController.class.uniqueId0 and b/server/build/tmp/compileJava/compileTransaction/stash-dir/PriceController.class.uniqueId0 differ diff --git a/server/build/tmp/compileJava/previous-compilation-data.bin b/server/build/tmp/compileJava/previous-compilation-data.bin index 52643f3..df72f46 100644 Binary files a/server/build/tmp/compileJava/previous-compilation-data.bin and b/server/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/server/src/main/java/com/swdc/server/controller/PriceController.java b/server/src/main/java/com/swdc/server/controller/PriceController.java index cc39073..251599f 100644 --- a/server/src/main/java/com/swdc/server/controller/PriceController.java +++ b/server/src/main/java/com/swdc/server/controller/PriceController.java @@ -4,7 +4,7 @@ package com.swdc.server.controller; -import com.swdc.server.domain.mongoDB.Price; +import com.swdc.server.domain.Storage.Price; import com.swdc.server.service.PriceService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; @@ -22,7 +22,6 @@ public class PriceController { private final PriceService priceService; - /** * * 플랫폼 이름, 카테고리 이름, 상품 id를 이용하여 priceService의 getProductDetails를 호출 diff --git a/server/src/main/java/com/swdc/server/domain/mongoDB/Price.java b/server/src/main/java/com/swdc/server/domain/Storage/Price.java similarity index 97% rename from server/src/main/java/com/swdc/server/domain/mongoDB/Price.java rename to server/src/main/java/com/swdc/server/domain/Storage/Price.java index d4e351b..af224b0 100644 --- a/server/src/main/java/com/swdc/server/domain/mongoDB/Price.java +++ b/server/src/main/java/com/swdc/server/domain/Storage/Price.java @@ -4,7 +4,7 @@ * */ -package com.swdc.server.domain.mongoDB; +package com.swdc.server.domain.Storage; import lombok.Builder; import lombok.Getter; diff --git a/server/src/main/java/com/swdc/server/domain/mongoDB/Product.java b/server/src/main/java/com/swdc/server/domain/Storage/Product.java similarity index 89% rename from server/src/main/java/com/swdc/server/domain/mongoDB/Product.java rename to server/src/main/java/com/swdc/server/domain/Storage/Product.java index 7f7eb73..1a7edf1 100644 --- a/server/src/main/java/com/swdc/server/domain/mongoDB/Product.java +++ b/server/src/main/java/com/swdc/server/domain/Storage/Product.java @@ -4,7 +4,7 @@ * */ -package com.swdc.server.domain.mongoDB; +package com.swdc.server.domain.Storage; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/server/src/main/java/com/swdc/server/domain/mongoDB/collection/CategoryCollection.java b/server/src/main/java/com/swdc/server/domain/mongoDB/collection/CategoryCollection.java deleted file mode 100644 index 9596d7d..0000000 --- a/server/src/main/java/com/swdc/server/domain/mongoDB/collection/CategoryCollection.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * - * Product_price_db의 collection인 {platform}_category_coll에 해당 - * - */ - -package com.swdc.server.domain.mongoDB.collection; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - - -@Getter -@Setter -@NoArgsConstructor -public class CategoryCollection { - private Integer id; - private String category_name; -} diff --git a/server/src/main/java/com/swdc/server/domain/mongoDB/collection/ProductCollection.java b/server/src/main/java/com/swdc/server/domain/mongoDB/collection/ProductCollection.java deleted file mode 100644 index 77ab074..0000000 --- a/server/src/main/java/com/swdc/server/domain/mongoDB/collection/ProductCollection.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * Product_price_db의 collection인 {platform}_product_coll에 해당 - * - */ - -package com.swdc.server.domain.mongoDB.collection; - -import com.swdc.server.domain.mongoDB.Product; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -@NoArgsConstructor -public class ProductCollection { - private String id; - - private Integer category_id; - private List products; -} diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 951d4a0..b3dd711 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -6,7 +6,7 @@ package com.swdc.server.service; -import com.swdc.server.domain.mongoDB.Price; +import com.swdc.server.domain.Storage.Price; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +53,12 @@ public Price getProductDetails(String platform, String category_name, String pro try (BufferedReader bufferedReader = Files.newBufferedReader(productPath)) { prices = bufferedReader.lines() .map(line -> line.split(",")) // 각 줄을 쉼표로 분리 - .map(parts -> Map.of(parts[0], Integer.parseInt(parts[1]))) // 날짜와 가격을 Map으로 변환 + .map(parts -> { + // 날짜와 시간 부분을 키로, 가격을 값으로 맵 구성 + String dateTime = parts[0] + "," + parts[1]; // "2024-09-20,09:00" 형태 + int price = Integer.parseInt(parts[2]); // "8000"을 정수로 변환 + return Map.of(dateTime, price); // Map 생성 + }) .collect(Collectors.toList()); // 모든 맵을 리스트로 수집 } catch (FileNotFoundException e) { System.err.println("File not found: " + productPath + ". Error: " + e.getMessage());