From ca273270cd55e594c472566ba9a351b6dcaaa3c6 Mon Sep 17 00:00:00 2001 From: Fibinger Ádám <adam.fibinger@wup.hu> Date: Wed, 20 Feb 2019 18:51:23 +0100 Subject: [PATCH] Fullly working mock version (Full CRUD can be tested) --- src/main/java/hu/unr/fiber/cardapi/CardController.java | 72 +++++++++++++++++++++++++++++------ pom.xml | 2 src/main/java/hu/unr/fiber/cardapi/Card.java | 26 ++++++++++++ 3 files changed, 85 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0f9edda..11d2d6c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>hu.unr.fiber</groupId> <artifactId>cardapi</artifactId> - <version>0.1.0</version> + <version>0.1.1</version> <parent> <groupId>org.springframework.boot</groupId> diff --git a/src/main/java/hu/unr/fiber/cardapi/Card.java b/src/main/java/hu/unr/fiber/cardapi/Card.java index eb30103..56d54bd 100644 --- a/src/main/java/hu/unr/fiber/cardapi/Card.java +++ b/src/main/java/hu/unr/fiber/cardapi/Card.java @@ -1,8 +1,12 @@ package hu.unr.fiber.cardapi; +import java.util.Objects; + public class Card { - private long id; + public static final long INVALID_ID = 0; + private long id = INVALID_ID; private String name; + //FIXME: @Pattern([0-9]+) private String number; private String cardHolder; @@ -19,6 +23,10 @@ public long getId() { return id; + } + + public boolean validId() { + return (this.getId() != Card.INVALID_ID); } public void setId(long id) { @@ -48,4 +56,20 @@ public void setCardHolder(String cardHolder) { this.cardHolder = cardHolder; } + + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Card card = (Card) o; + return id == card.id && + name.equals(card.name) && + number.equals(card.number) && + Objects.equals(cardHolder, card.cardHolder); + } + + public void update(Card otherCard) { + this.setName(otherCard.getName()); + this.setNumber(otherCard.getNumber()); + this.setCardHolder(otherCard.getCardHolder()); + } } diff --git a/src/main/java/hu/unr/fiber/cardapi/CardController.java b/src/main/java/hu/unr/fiber/cardapi/CardController.java index a25836a..d3eb21f 100644 --- a/src/main/java/hu/unr/fiber/cardapi/CardController.java +++ b/src/main/java/hu/unr/fiber/cardapi/CardController.java @@ -1,5 +1,6 @@ package hu.unr.fiber.cardapi; +import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -7,7 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -28,23 +28,67 @@ @GetMapping("/") public String index() { - logger.info("/index called."); - return "Hello world! Hateoas helyett: (/cards GET /card/{id} POST /card/{id} PUT /card/{id} DELETE /card/{id} )"; + logger.info("GET /index called."); + return "Hateoas helyett: (/cards GET /card/{id} POST /card/{id} PUT /card/{id} DELETE /card/{id} )"; } @GetMapping("/cards") public List<Card> cards() { - logger.info("/cards called, responded with " + cardList.size() + " items."); + logger.info("GET /cards called, responded with " + cardList.size() + " items."); return cardList; } @GetMapping(value = "/card/{id}") - public ResponseEntity<Card> getUser(@PathVariable("id") long id) { - logger.info("/card/" + id + " called"); + public ResponseEntity<Card> 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 + } + + @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."); + } + + Card originalCard = this.getCardByID(id); + + if (originalCard.equals(updatedCard)) { + 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."); + } + + originalCard.update(updatedCard); + + return ResponseEntity.accepted().body("OK"); } private Card getCardByID(long id) { @@ -70,26 +114,28 @@ @PostMapping(value = "/card") public ResponseEntity<String> createCard(@RequestBody Card card, UriComponentsBuilder ucBuilder) { - logger.info("Creating Card : {}", card); + logger.info("Creating Card : {}", 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).build(); + return ResponseEntity.status(HttpStatus.CONFLICT).body("Card with number "+ card.getNumber() + " already exists."); } - long nextId = new Random().nextLong(); + long nextId = 1; while (this.getCardByID(nextId) != null) { - nextId = new Random().nextLong(); + nextId++; } card.setId(nextId); cardList.add(card); - HttpHeaders headers = new HttpHeaders(); - headers.setLocation(ucBuilder.path("/card/{id}").buildAndExpand(card.getId()).toUri()); - return new ResponseEntity<String>(headers, HttpStatus.CREATED); + URI newCardURI = ucBuilder.path("/card/{id}").buildAndExpand(card.getId()).toUri(); + + return ResponseEntity + .created(newCardURI) + .body(newCardURI.toString()); } } \ No newline at end of file -- Gitblit v1.8.0