Skip to content

Commit

Permalink
Revert "Feat/update init db(#78)"
Browse files Browse the repository at this point in the history
  • Loading branch information
@jinhoon227
jinhoon227 authored Sep 16, 2023
1 parent 3720cb8 commit 6886576
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 161 deletions.
157 changes: 9 additions & 148 deletions src/main/java/iampotato/iampotato/InitDb.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void dbStores1() throws ParseException {
.createdDate(LocalDateTime.now())
.outletNum(0)
.closedDay(StoreDay.FRI)
.address(new Address("충북 청주시 서원구 1순환로 6720길 64", "h2", "h3", "h4"))
.address(new Address("h1", "h2", "h3", "h4"))
.category(StoreCategory.CAFE)
.location((Point) new WKTReader().read(String.format("POINT(%s %s)", 127.455409, 36.625170)))
.phone("01012345678")
Expand All @@ -84,29 +84,14 @@ public void dbStores1() throws ParseException {
StoreImage storeImage1 = StoreImage.builder()
.store(store1)
.creatTime(LocalDateTime.now())
.storeImg("https://github.com/sayingpotato/Frontend-Web/assets/64068511/3f3d91b3-3b3a-41e8-8d8e-467174118a96")
.storeImg("default:1212")
.build();
StoreImage storeImage2 = StoreImage.builder()
.store(store1)
.creatTime(LocalDateTime.now())
.storeImg("https://github.com/sayingpotato/Frontend-Web/assets/64068511/65648635-b505-4c73-b18b-c381569b20a9")
.build();
StoreImage storeImage3 = StoreImage.builder()
.store(store1)
.creatTime(LocalDateTime.now())
.storeImg("https://github.com/sayingpotato/Frontend-Web/assets/64068511/1ed76463-29ca-44b2-874e-9a08c48256e1")
.build();
StoreImage storeImage4 = StoreImage.builder()
.store(store1)
.creatTime(LocalDateTime.now())
.storeImg("https://github.com/sayingpotato/Frontend-Web/assets/64068511/5c7bddf0-647e-441c-a695-faf12083a933")
.build();
StoreImage storeImage5 = StoreImage.builder()
.store(store1)
.creatTime(LocalDateTime.now())
.storeImg("https://github.com/sayingpotato/Frontend-Web/assets/64068511/6fe0fcf0-b38e-4b4e-ac1b-42627a445755")
.storeImg("default:1213")
.build();
StoreImages storeImages = new StoreImages(storeImage1, storeImage2, storeImage3, storeImage4, storeImage5);
StoreImages storeImages = new StoreImages(storeImage1, storeImage2);

Review review1 = Review.builder()
.store(store1)
Expand Down Expand Up @@ -165,145 +150,21 @@ public void dbStores1() throws ParseException {

Item item1 = Item.builder()
.store(store1)
.name("아메리카노")
.name("돼지불고기")
.category(ItemCategory.PORK)
.img("https://github.com/sayingpotato/Frontend-Web/assets/64068511/159b3769-cf0f-4d2e-8307-ba63ae71c8d3")
.img("http://dffdf")
.price(5000)
.build();

Item item2 = Item.builder()
.store(store1)
.name("자몽허니블랙티")
.name("대창")
.category(ItemCategory.PORK)
.img("https://github.com/sayingpotato/Frontend-Web/assets/64068511/c95086b5-179b-4234-8ce5-0480a714fcc3")
.img("http://dffdf2")
.price(10000)
.build();

Item item3 = Item.builder()
.store(store1)
.name("카페라떼")
.category(ItemCategory.PORK)
.img("https://github.com/sayingpotato/Frontend-Web/assets/64068511/8f777931-2110-4093-beff-c4b1f807234b")
.price(7000)
.build();

Item item4 = Item.builder()
.store(store1)
.name("핫초코")
.category(ItemCategory.PORK)
.img("https://github.com/sayingpotato/Frontend-Web/assets/64068511/2f95dd53-70e4-47a0-b36b-2f32b7de1b55")
.price(4000)
.build();

ItemOption itemOption1 = ItemOption.builder()
.item(item1)
.name("톨")
.price(0)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption2 = ItemOption.builder()
.item(item1)
.name("그란데")
.price(500)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption3 = ItemOption.builder()
.item(item1)
.name("벤티")
.price(1000)
.category(ItemOptionCategory.SIZE)
.build();

List<ItemOption> itemOptions = new ArrayList<>();
itemOptions.add(itemOption1);
itemOptions.add(itemOption2);
itemOptions.add(itemOption3);
item1.updateCollection(itemOptions);

ItemOption itemOption4 = ItemOption.builder()
.item(item1)
.name("톨")
.price(0)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption5 = ItemOption.builder()
.item(item1)
.name("그란데")
.price(500)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption6 = ItemOption.builder()
.item(item1)
.name("벤티")
.price(1000)
.category(ItemOptionCategory.SIZE)
.build();

List<ItemOption> itemOptions2 = new ArrayList<>();
itemOptions.add(itemOption4);
itemOptions.add(itemOption5);
itemOptions.add(itemOption6);
item2.updateCollection(itemOptions2);

ItemOption itemOption7 = ItemOption.builder()
.item(item1)
.name("톨")
.price(0)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption8 = ItemOption.builder()
.item(item1)
.name("그란데")
.price(500)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption9 = ItemOption.builder()
.item(item1)
.name("벤티")
.price(1000)
.category(ItemOptionCategory.SIZE)
.build();

List<ItemOption> itemOptions3 = new ArrayList<>();
itemOptions.add(itemOption7);
itemOptions.add(itemOption8);
itemOptions.add(itemOption9);
item3.updateCollection(itemOptions3);

ItemOption itemOption10 = ItemOption.builder()
.item(item1)
.name("톨")
.price(0)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption11 = ItemOption.builder()
.item(item1)
.name("그란데")
.price(500)
.category(ItemOptionCategory.SIZE)
.build();

ItemOption itemOption12 = ItemOption.builder()
.item(item1)
.name("벤티")
.price(1000)
.category(ItemOptionCategory.SIZE)
.build();

List<ItemOption> itemOptions4 = new ArrayList<>();
itemOptions.add(itemOption10);
itemOptions.add(itemOption11);
itemOptions.add(itemOption12);
item3.updateCollection(itemOptions4);

Items items = new Items(item1, item2, item3, item4);
Items items = new Items(item1, item2);

store1.updateCollection(storeOperationHours, storeImages, reviews, discounts, items);

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/iampotato/iampotato/domain/store/dto/detail/StoreDetailItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ public class StoreDetailItems {

String name;

int price;

List<StoreDetailItemOptions> storeDetailItemOptions;

public StoreDetailItems(Item item) {
this.id = item.getId();
this.name = item.getName();
this.price = item.getPrice();
this.storeDetailItemOptions = item.getItemOptions().getItemOptions().stream()
.map(StoreDetailItemOptions::new)
.collect(Collectors.toList());
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/iampotato/iampotato/domain/store/dto/detail/StoreDetailResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,9 @@
public class StoreDetailResponse {

Long id;

String name;

Address address;

String tableImg;

String phone;

int outletNum;

List<StoreDetailStoreOperationHour> storeOperationHours;

List<StoreDetailStoreImage> storeDetailStoreImages;
Expand All @@ -37,8 +29,6 @@ public StoreDetailResponse(Store store) {
this.address = store.getAddress();
this.name = store.getName();
this.tableImg = store.getTableImg();
this.phone = store.getPhone();
this.outletNum = store.getOutletNum();

this.storeOperationHours = store.getStoreOperationHours().getStoreOperationHours().stream()
.map(StoreDetailStoreOperationHour::new)
Expand Down

0 comments on commit 6886576

Please sign in to comment.