Skip to content

Commit

Permalink
Merge pull request #16 from Dae-Hwa/revert-11-BE/preparation/mockup-a…
Browse files Browse the repository at this point in the history 
…pi-course

Revert "[BE] Course 반찬 추가"
  • Loading branch information
@Dae-Hwa
Dae-Hwa authored Apr 23, 2021
2 parents eb96079 + df4ab2e commit e8419a2
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 124 deletions.
5 changes: 0 additions & 5 deletions be/sidedish-be/src/main/java/com/codesquad/sidedish/utils/SampleDataFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ public static List<ItemDTO> createMainSidedishes() {
});
}

public static List<ItemDTO> createCourseSidedishes() {
return jsonToObject("sample-data/course-sidedishes.json", new TypeReference<List<ItemDTO>>() {
});
}

private static <E> E jsonToObject(String jsonFilePath, TypeReference<E> typeReference) {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
Expand Down
15 changes: 0 additions & 15 deletions ...dedish-be/src/main/java/com/codesquad/sidedish/web/sidedish/CourseSidedishController.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion be/sidedish-be/src/main/resources-dev/sample-data/course-sidedishes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@
"이벤트특가"
]
}
]
]
2 changes: 1 addition & 1 deletion be/sidedish-be/src/main/resources-dev/sample-data/side-sidedishes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@
"s_price": "4,500원",
"badge": []
}
]
]
11 changes: 0 additions & 11 deletions be/sidedish-be/src/test/java/com/codesquad/sidedish/utils/SampleDataFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,4 @@ void createMainSidedishes() throws JsonProcessingException {
assertThat(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(itemDTOS))
.isEqualTo(ItemDTOTestResults.MAIN_MENU);
}

@Test
void createCourseSidedishes() throws JsonProcessingException {
if(!environment.acceptsProfiles(Profiles.of("dev"))) {
return;
}
List<ItemDTO> itemDTOs = SampleDataFactory.createCourseSidedishes();

assertThat(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(itemDTOs))
.isEqualTo(ItemDTOTestResults.COURSE_MENU);
}
}
91 changes: 0 additions & 91 deletions be/sidedish-be/src/test/java/com/codesquad/sidedish/web/sidedish/ItemDTOTestResults.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,95 +83,4 @@ public class ItemDTOTestResults {
" \"s_price\" : \"5,000\","+ System.lineSeparator() +
" \"badge\" : null"+ System.lineSeparator() +
"} ]";
public static final String COURSE_MENU = "[ {" + System.lineSeparator() +
" \"detail_hash\" : \"HBDEF\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/HBDEF/4a2d8bbe9fb468b536861140a9beda61.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[미노리키친] 규동 250g\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[미노리키친] 규동 250g\"," + System.lineSeparator() +
" \"description\" : \"일본인의 소울푸드! 한국인도 좋아하는 소고기덮밥\"," + System.lineSeparator() +
" \"n_price\" : \"6,500\"," + System.lineSeparator() +
" \"s_price\" : \"5,200\"," + System.lineSeparator() +
" \"badge\" : [ \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"H4C5E\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/H4C5E/898e5088fa4a039173d7cf8f6565edc6.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[아내의쉐프] 메밀 비빔막국수 (790g 내외)\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[아내의쉐프] 메밀 비빔막국수 (790g 내외)\"," + System.lineSeparator() +
" \"description\" : \"무더위에 지친 날, 시원하게 막국수 한 그릇 비벼주세요!\"," + System.lineSeparator() +
" \"n_price\" : \"11,900\"," + System.lineSeparator() +
" \"s_price\" : \"10,700\"," + System.lineSeparator() +
" \"badge\" : [ \"론칭특가\", \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"H8676\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/H8676/f3c133e85c47627443b78443d7ec6a9e.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[소중한식탁] 쫀득냉채족발(2인분)\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[소중한식탁] 쫀득냉채족발(2인분)\"," + System.lineSeparator() +
" \"description\" : \"친환경 채소와 쫀득한 족발의 만남!\"," + System.lineSeparator() +
" \"n_price\" : \"11,900\"," + System.lineSeparator() +
" \"s_price\" : \"10,700\"," + System.lineSeparator() +
" \"badge\" : [ \"론칭특가\", \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"HAE92\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/HAE92/039560e489ded012e83891d63eea520b.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[소중한식사] 파채 생연어 스테이크 220g\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[소중한식사] 파채 생연어 스테이크 220g\"," + System.lineSeparator() +
" \"description\" : \"횟감용 노르웨이산 연어로 우아하게\"," + System.lineSeparator() +
" \"n_price\" : \"0\"," + System.lineSeparator() +
" \"s_price\" : \"16,000\"," + System.lineSeparator() +
" \"badge\" : [ ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"HAA29\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/HAA29/f6a49dff42df329f13c98d6a83dd2ea9.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[개금밀면] 부산개금밀면 2인분\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[개금밀면] 부산개금밀면 2인분\"," + System.lineSeparator() +
" \"description\" : \"밀면하면 부산개금밀면 아입니까~\"," + System.lineSeparator() +
" \"n_price\" : \"10,600\"," + System.lineSeparator() +
" \"s_price\" : \"10,000\"," + System.lineSeparator() +
" \"badge\" : [ \"론칭특가\", \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"H296C\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/H296C/a9921407d310a5de19d1d5513750ebbc.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[아내의쉐프] 낙새볶음 (570g 내외)\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[아내의쉐프] 낙새볶음 (570g 내외)\"," + System.lineSeparator() +
" \"description\" : \"칼칼하게 매운맛이 일품인 밥도둑!\"," + System.lineSeparator() +
" \"n_price\" : \"13,900\"," + System.lineSeparator() +
" \"s_price\" : \"12,500\"," + System.lineSeparator() +
" \"badge\" : [ \"론칭특가\", \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"H5152\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/H5152/719e2eb41fa751e1e01dc748d8ea2869.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[셰프찬] 문어초회 200g\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[셰프찬] 문어초회 200g\"," + System.lineSeparator() +
" \"description\" : \"초여름 불볕더위가 가실만한 상큼한 문어초회\"," + System.lineSeparator() +
" \"n_price\" : \"16,000\"," + System.lineSeparator() +
" \"s_price\" : \"13,600\"," + System.lineSeparator() +
" \"badge\" : [ \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"HAC68\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/HAC68/0c2ce5f5d1bc2e094f1b5f97b5192fe7.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[집밥의완성] 데리야끼장어구이 160g\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[집밥의완성] 데리야끼장어구이 160g\"," + System.lineSeparator() +
" \"description\" : \"'장어'하면 몸보신!\"," + System.lineSeparator() +
" \"n_price\" : \"12,800\"," + System.lineSeparator() +
" \"s_price\" : \"9,900\"," + System.lineSeparator() +
" \"badge\" : [ \"이벤트특가\" ]" + System.lineSeparator() +
"}, {" + System.lineSeparator() +
" \"detail_hash\" : \"HBDEF\"," + System.lineSeparator() +
" \"image\" : \"https://cdn.bmf.kr/_data/product/HBDEF/4a2d8bbe9fb468b536861140a9beda61.jpg\"," + System.lineSeparator() +
" \"alt\" : \"[미노리키친] 규동 250g\"," + System.lineSeparator() +
" \"delivery_type\" : [ \"새벽배송\", \"전국택배\" ]," + System.lineSeparator() +
" \"title\" : \"[미노리키친] 규동 250g\"," + System.lineSeparator() +
" \"description\" : \"일본인의 소울푸드! 한국인도 좋아하는 소고기덮밥\"," + System.lineSeparator() +
" \"n_price\" : \"6,500\"," + System.lineSeparator() +
" \"s_price\" : \"5,200\"," + System.lineSeparator() +
" \"badge\" : [ \"이벤트특가\" ]" + System.lineSeparator() +
"} ]";
}

0 comments on commit e8419a2

Please sign in to comment.