Just keeping calm and keep refactoring

Fibinger Ádám

2019-03-11 94fead6be729cfb23b657d853c5499709a3d27c4

 src/main/java/hu/unr/fiber/cardapi/CardController.java

@@ -1,26 +1,25 @@
package hu.unr.fiber.cardapi;

import java.net.URI;
import java.util.List;
import java.util.Optional;

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;

    CardController(CardRepository cR)
    {
        this.cardRepository = cR;
    CardController(CardInteractor cS) {
        this.cardService = cS;
    }

    CardRepository cardRepository;

    @GetMapping("/")
    public String index() {
@@ -29,71 +28,67 @@
    }

    @GetMapping("/cards")
    public List<Card> cards() {
    public ResponseEntity<List<CardInterface>> cards() {
        logger.info("GET /cards called, responded with items.");
        return cardRepository.findAll();
        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.");

        if (!this.cardRepository.existsById(id)) {
            return ResponseEntity.notFound().build();
        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);
        }

        Card card = this.cardRepository.getOne(id);

        return ResponseEntity.ok().body(card);
    }

    @DeleteMapping(value = "/card/{id}")
    public ResponseEntity<String> deleteCard(@PathVariable("id") long id) {
        logger.info("DELETE /card/" + id + " called");

        return Optional
                .ofNullable(this.cardRepository.getOne(id))
                .map(
                        card -> {
                            this.cardRepository.delete(card);
                            this.cardRepository.flush();
                            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.cardRepository.getOne(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 getCardByNumber(String number) {
    private RestCard getCardByNumber(String number) {

        Long id = cardRepository.findIdByNumber(number);

@@ -105,12 +100,12 @@
    }

    @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.");
        }

        this.cardRepository.saveAndFlush(card);
@@ -121,5 +116,5 @@
                .created(newCardURI)
                .body(newCardURI.toString());
    }

    */
}