From 3bcc35e75b543bc20a07387d53d6100184b3ae94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Wed, 6 Jan 2021 14:34:25 +0100 Subject: [PATCH] Checkpoint: dziala sprawdzanie values in the exchanges/exchange MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .../com/plannaplan/entities/Exchange.java | 10 +++++++++ .../controllers/ExchangeController.java | 21 +++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Exchange.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Exchange.java index 9f8293d..37b7111 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/entities/Exchange.java +++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Exchange.java @@ -4,6 +4,8 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; @Entity public class Exchange { @@ -12,8 +14,16 @@ public class Exchange { @GeneratedValue(strategy = GenerationType.AUTO) private Long id; + @OneToOne + @JoinColumn(name = "trader_id") private User trader; + + @OneToOne + @JoinColumn(name = "owned_id") private Assignment ownedAssignment; + + @OneToOne + @JoinColumn(name = "desired_id") private Groups desiredAssignment; public Exchange() { diff --git a/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java b/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java index 79d67e8..5341dcb 100644 --- a/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java @@ -1,8 +1,15 @@ package com.plannaplan.controllers; import java.util.Map; +import java.util.Optional; import com.plannaplan.App; +import com.plannaplan.entities.Assignment; +import com.plannaplan.entities.Groups; +import com.plannaplan.entities.User; +import com.plannaplan.repositories.ExchangeRepository; + +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; @@ -18,10 +25,20 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/api/" + App.API_VERSION + "/exchanges") @Api(tags = { "Exchange" }, value = "Exchange", description = "Endpoint to exchange with accepted assignments.") public class ExchangeController { - + @PostMapping("/exchange") @ApiOperation(value = "Return all courses") - public ResponseEntity createExchange(@RequestBody Map exchangeRequest){ + public ResponseEntity createExchange(@RequestBody Map exchangeRequest){ + Long user = exchangeRequest.get("user"); + Long assignment = exchangeRequest.get("assignment"); + Long group = exchangeRequest.get("group"); + + if(user == null || assignment == null|| group == null ){ + return new ResponseEntity<>("Some of provided value missing", HttpStatus.BAD_REQUEST); + } + + //System.out.println("KUPA"); + return null; } }