From 94fead6be729cfb23b657d853c5499709a3d27c4 Mon Sep 17 00:00:00 2001
From: Fibinger Ádám <adam.fibinger@wup.hu>
Date: Mon, 11 Mar 2019 19:39:11 +0100
Subject: [PATCH] Just keeping calm and keep refactoring
---
src/main/java/hu/unr/fiber/cardapi/CardController.java | 135 +++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 78 deletions(-)
diff --git a/src/main/java/hu/unr/fiber/cardapi/CardController.java b/src/main/java/hu/unr/fiber/cardapi/CardController.java
index d3eb21f..8de17cc 100644
--- a/src/main/java/hu/unr/fiber/cardapi/CardController.java
+++ b/src/main/java/hu/unr/fiber/cardapi/CardController.java
@@ -1,29 +1,24 @@
package hu.unr.fiber.cardapi;
-import java.net.URI;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
-import java.util.Random;
+import hu.unr.fiber.cardapi.hibernate.CardNotFoundException;
+import hu.unr.fiber.cardapi.interfaces.CardInterface;
+import hu.unr.fiber.cardapi.hibernate.CardInteractor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.server.ResponseStatusException;
@RestController
public class CardController {
Logger logger = LoggerFactory.getLogger(CardController.class);
+ private CardInteractor cardService;
- protected List<Card> cardList = new ArrayList<>();
-
- public CardController() {
- cardList.add(new Card(1, "Első kártya", "1"));
- cardList.add(new Card(2, "Második kártya", "2"));
- cardList.add(new Card(5, "Harmadik kártya", "4"));
- cardList.add(new Card(8, "Tízezer egyszázadik kártya", "10100"));
+ CardController(CardInteractor cS) {
+ this.cardService = cS;
}
@GetMapping("/")
@@ -33,103 +28,87 @@
}
@GetMapping("/cards")
- public List<Card> cards() {
- logger.info("GET /cards called, responded with " + cardList.size() + " items.");
- return cardList;
+ public ResponseEntity<List<CardInterface>> cards() {
+ logger.info("GET /cards called, responded with items.");
+ List<CardInterface> cardList = cardService.getCardList();
+ return ResponseEntity.ok().body(cardList);
}
@GetMapping(value = "/card/{id}")
- public ResponseEntity<Card> getCard(@PathVariable("id") long id) {
+ public ResponseEntity<CardInterface> getCard(@PathVariable("id") long id) {
logger.info("GET /card/" + id + " called.");
- return Optional
- .ofNullable(this.getCardByID(id))
- .map(card -> ResponseEntity.ok().body(card)) //200 OK
- .orElseGet(() -> ResponseEntity.notFound().build()); //404 Not found
+
+ try {
+ CardInterface card = this.cardService.getCardById(id);
+ return ResponseEntity.ok().body(card);
+ } catch (CardNotFoundException e) {
+ throw new ResponseStatusException(HttpStatus.NOT_FOUND, "No such card with id: #" + id);
+ }
}
@DeleteMapping(value = "/card/{id}")
public ResponseEntity<String> deleteCard(@PathVariable("id") long id) {
logger.info("DELETE /card/" + id + " called");
- return Optional
- .ofNullable(this.getCardByID(id))
- .map(
- card -> {
- this.cardList.remove(card);
- return ResponseEntity.ok().body("OK");
- }
- )
- .orElseGet(() -> ResponseEntity.status(HttpStatus.NOT_FOUND).body("No card available with id: "+ id));
- }
-
- @PostMapping(value = "/card/{id}")
- public ResponseEntity<String> updateCard(@PathVariable("id") long id, @RequestBody Card updatedCard, UriComponentsBuilder ucBuilder) {
-
- logger.info("POST /card/"+ id + " called, card update.");
-
- if (updatedCard.validId() && (updatedCard.getId() != id))
- {
- return ResponseEntity
- .badRequest()
- .body("Id field cannot be modified.");
+ try {
+ this.cardService.delete(id);
+ } catch (CardNotFoundException e) {
+ throw new ResponseStatusException(HttpStatus.NOT_FOUND, "No such card with id: #" + id, e);
}
- Card originalCard = this.getCardByID(id);
+ return ResponseEntity.ok().body("OK");
+ }
+/*
+ @PostMapping(value = "/card/{id}")
+ public ResponseEntity<String> updateCard(@PathVariable("id") long id, @RequestBody RestCard updatedCardEntity, UriComponentsBuilder ucBuilder) {
- if (originalCard.equals(updatedCard)) {
+ logger.info("POST /card/" + id + " called, card update.");
+ try {
+ this.cardService.update(id, updatedCardEntity);
+ } catch (CardInvalidUpdateException e){
+
+ }
+
+
+ RestCard originalCardEntity = this.cardRepository.getOne(id);
+
+ if (originalCardEntity.equals(updatedCardEntity)) {
return ResponseEntity.accepted().body("Update has no changes.");
}
//card number updated, we have to check if its already exists
- if (!originalCard.getNumber().equals(updatedCard.getNumber()) && this.getCardByNumber(updatedCard.getNumber()) != null) {
- logger.error("Unable to update card with id {}. A different Card with number {} already exist", originalCard.getId(), updatedCard.getNumber());
- return ResponseEntity.status(HttpStatus.CONFLICT).body("Card with number " + updatedCard.getNumber() + " already exists.");
+ if (!originalCardEntity.getNumber().equals(updatedCardEntity.getNumber()) && this.getCardByNumber(updatedCardEntity.getNumber()) != null) {
+ logger.error("Unable to update card with id {}. A different RestCard with number {} already exist", originalCardEntity.getId(), updatedCardEntity.getNumber());
+ return ResponseEntity.status(HttpStatus.CONFLICT).body("RestCard with number " + updatedCardEntity.getNumber() + " already exists.");
}
- originalCard.update(updatedCard);
+ originalCardEntity.update(updatedCardEntity);
+ this.cardRepository.flush();
return ResponseEntity.accepted().body("OK");
}
- private Card getCardByID(long id) {
- for (Card card : cardList) {
- if (card.getId() == id) {
- return card;
- }
+ private RestCard getCardByNumber(String number) {
+
+ Long id = cardRepository.findIdByNumber(number);
+
+ if (id == null) {
+ return null;
}
- return null;
+ return cardRepository.getOne(id);
}
-
- private Card getCardByNumber(String number) {
- for (Card card : cardList) {
- if (card.getNumber().equals(number)) {
- return card;
- }
- }
-
- return null;
- }
-
@PostMapping(value = "/card")
- public ResponseEntity<String> createCard(@RequestBody Card card, UriComponentsBuilder ucBuilder) {
- logger.info("Creating Card : {}", card.getNumber());
+ public ResponseEntity<String> createCard(@RequestBody RestCard card, UriComponentsBuilder ucBuilder) {
+ logger.info("Creating RestCard : {}", card.getNumber());
if (this.getCardByNumber(card.getNumber()) != null) {
- logger.error("Unable to create. A Card with number {} already exist", card.getNumber());
- return ResponseEntity.status(HttpStatus.CONFLICT).body("Card with number "+ card.getNumber() + " already exists.");
+ logger.error("Unable to create. A RestCard with number {} already exist", card.getNumber());
+ return ResponseEntity.status(HttpStatus.CONFLICT).body("RestCard with number " + card.getNumber() + " already exists.");
}
- long nextId = 1;
-
- while (this.getCardByID(nextId) != null) {
- nextId++;
- }
-
- card.setId(nextId);
-
- cardList.add(card);
+ this.cardRepository.saveAndFlush(card);
URI newCardURI = ucBuilder.path("/card/{id}").buildAndExpand(card.getId()).toUri();
@@ -137,5 +116,5 @@
.created(newCardURI)
.body(newCardURI.toString());
}
-
+ */
}
\ No newline at end of file
--
Gitblit v1.8.0