Skip to content

refactor chatbot bus feature by applying design patterns && remove un… #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knight7024 merged 1 commit into from
Mar 4, 2020
Merged

refactor chatbot bus feature by applying design patterns && remove un… #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions src/main/java/koreatech/in/controller/KakaoBotController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import koreatech.in.service.KakaoBotService;
import koreatech.in.skillresponse.KakaoBotEnum;
import koreatech.in.skillresponse.KakaoBot;
import koreatech.in.skillresponse.SkillResponse;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -25,66 +25,66 @@ public class KakaoBotController {

@RequestMapping(value = "/dinings", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
public @ResponseBody
ResponseEntity requestDinings(@RequestBody String body) {
JsonParser jsonParser = new JsonParser();
JsonElement jsonElement = jsonParser.parse(body);

// ['action']['params']['mealtime']
JsonElement action = jsonElement.getAsJsonObject().get("action");
JsonElement params = action.getAsJsonObject().get("params");
String mealtime = params.getAsJsonObject().get("mealtime").getAsString();

ResponseEntity<String> requestDinings(@RequestBody String body) {
String result;
try {
JsonParser jsonParser = new JsonParser();
JsonElement jsonElement = jsonParser.parse(body);

// ['action']['params']['mealtime']
JsonElement action = jsonElement.getAsJsonObject().get("action");
JsonElement params = action.getAsJsonObject().get("params");
String mealtime = params.getAsJsonObject().get("mealtime").getAsString();

result = kakaoBotService.crawlHaksik(mealtime);
} catch (Exception e) {
SkillResponse errorMsg = new SkillResponse();
errorMsg.addSimpleText("API 오류가 발생하였습니다.");
result = errorMsg.getSkillPayload().toString();
}

return new ResponseEntity<String>(result, HttpStatus.OK);
return new ResponseEntity<>(result, HttpStatus.OK);
}

@RequestMapping(value = "/buses/request", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
public @ResponseBody
ResponseEntity requestBuses(@RequestBody String body) {
ResponseEntity<String> requestBuses(@RequestBody String body) {
SkillResponse busSkill = new SkillResponse();
busSkill.addQujckReplies("한기대→야우리", KakaoBotEnum.QuickRepliesActionType.MESSAGE.getTypeText(), "한기대→야우리");
busSkill.addQujckReplies("한기대→천안역", KakaoBotEnum.QuickRepliesActionType.MESSAGE.getTypeText(), "한기대→천안역");
busSkill.addQujckReplies("야우리→한기대", KakaoBotEnum.QuickRepliesActionType.MESSAGE.getTypeText(), "야우리→한기대");
busSkill.addQujckReplies("야우리→천안역", KakaoBotEnum.QuickRepliesActionType.MESSAGE.getTypeText(), "야우리→천안역");
busSkill.addQujckReplies("천안역→한기대", KakaoBotEnum.QuickRepliesActionType.MESSAGE.getTypeText(), "천안역→한기대");
busSkill.addQujckReplies("천안역→야우리", KakaoBotEnum.QuickRepliesActionType.MESSAGE.getTypeText(), "천안역→야우리");
busSkill.addQujckReplies("한기대→야우리", KakaoBot.QuickRepliesActionType.MESSAGE.getTypeText(), "한기대→야우리");
busSkill.addQujckReplies("한기대→천안역", KakaoBot.QuickRepliesActionType.MESSAGE.getTypeText(), "한기대→천안역");
busSkill.addQujckReplies("야우리→한기대", KakaoBot.QuickRepliesActionType.MESSAGE.getTypeText(), "야우리→한기대");
busSkill.addQujckReplies("야우리→천안역", KakaoBot.QuickRepliesActionType.MESSAGE.getTypeText(), "야우리→천안역");
busSkill.addQujckReplies("천안역→한기대", KakaoBot.QuickRepliesActionType.MESSAGE.getTypeText(), "천안역→한기대");
busSkill.addQujckReplies("천안역→야우리", KakaoBot.QuickRepliesActionType.MESSAGE.getTypeText(), "천안역→야우리");

busSkill.addSimpleText("선택하세요!");

String busSkillStr = busSkill.getSkillPayload().toString();

return new ResponseEntity<String>(busSkillStr, HttpStatus.OK);
return new ResponseEntity<>(busSkillStr, HttpStatus.OK);
}

@RequestMapping(value = "/buses", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
public @ResponseBody
ResponseEntity returnBuses(@RequestBody String body) {
JsonParser jsonParser = new JsonParser();
JsonElement jsonElement = jsonParser.parse(body);

// ['action']['params']['place'], ['action']['params']['place1']
JsonElement action = jsonElement.getAsJsonObject().get("action");
JsonElement params = action.getAsJsonObject().get("params");
String depart = params.getAsJsonObject().get("place").getAsString();
String arrival = params.getAsJsonObject().get("place1").getAsString();

ResponseEntity<String> returnBuses(@RequestBody String body) {
String result;
try {
JsonParser jsonParser = new JsonParser();
JsonElement jsonElement = jsonParser.parse(body);

// ['action']['params']['place'], ['action']['params']['place1']
JsonElement action = jsonElement.getAsJsonObject().get("action");
JsonElement params = action.getAsJsonObject().get("params");
String depart = params.getAsJsonObject().get("place").getAsString();
String arrival = params.getAsJsonObject().get("place1").getAsString();

result = kakaoBotService.calculateBus(depart, arrival);
} catch (Exception e) {
SkillResponse errorMsg = new SkillResponse();
errorMsg.addSimpleText("API 오류가 발생하였습니다.");
result = errorMsg.getSkillPayload().toString();
}

return new ResponseEntity<String>(result, HttpStatus.OK);
return new ResponseEntity<>(result, HttpStatus.OK);
}
}
2 changes: 1 addition & 1 deletion src/main/java/koreatech/in/controller/admin/AdminCalendarController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class AdminCalendarController {
@ApiOperation(value = "", authorizations = {@Authorization(value="Authorization")})
@RequestMapping(value = "/admin/term", method = RequestMethod.POST)
public @ResponseBody
ResponseEntity<String> createTerm(@ApiParam(required = true, value = "10: 1학기 정규, 11: 1학기 계절, 20: 2학기 정규, 21: 2학기 계절") @RequestBody String term) {
ResponseEntity<String> createTerm(@ApiParam(required = true, value = "10: 1학기 정규, 11: 1학기 계절, 12: 1학기 계절 이후, 20: 2학기 정규, 21: 2학기 계절, 22: 2학기 계절 이후") @RequestBody String term) {

return new ResponseEntity<>(calendarService.createTermForAdmin(term), HttpStatus.CREATED);
}
Expand Down
Loading