filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Checkpoint: Added docs, improved ExchangeEntity

Browse Source
This commit is contained in:
Marcin Woźniak 2021-01-06 17:12:20 +01:00
parent b633d2c2df
commit 90f154f23b
Signed by: y0rune
GPG Key ID: F204C385F57EB348
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buisnesslogic/src/main/java/com/plannaplan/entities/Exchange.java
View File

@ -18,7 +18,7 @@ public class Exchange {
private Long id; private Long id;
@OneToOne @OneToOne
@JoinColumn(name = "owned_id") @JoinColumn(name = "owned_id", unique = true)
private Assignment ownedAssignment; private Assignment ownedAssignment;
@OneToOne @OneToOne

6
buisnesslogic/src/main/java/com/plannaplan/services/ExchangeService.java
View File

@ -24,6 +24,12 @@ public class ExchangeService {
return this.repo.save(exchange); return this.repo.save(exchange);
} }
/**
* @param assignment Assignment to trade for
* @param group Desired group
* @return Optional with Exchange if exist
*/
public Optional<Exchange> checkForExchange(Assignment assignment, Groups group){ public Optional<Exchange> checkForExchange(Assignment assignment, Groups group){
return this.repo.checkForExchange(assignment, group); return this.repo.checkForExchange(assignment, group);
} }

3
restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java
View File

@ -69,9 +69,8 @@ public class ExchangeController extends TokenBasedController{
final Assignment assignmentInstance = assignment.get(); final Assignment assignmentInstance = assignment.get();
final Groups groupInstance = group.get(); final Groups groupInstance = group.get();
final Optional<Exchange> exchangeInstance = this.exchangeService.checkForExchange(assignmentInstance, groupInstance);
if(!(assignmentInstance.getCommision().getCommisionOwner().getId() == asker.getId() && assignmentInstance.isAccepted() && exchangeInstance.isEmpty())){ if(!(assignmentInstance.getCommision().getCommisionOwner().getId().equals(asker.getId()) && assignmentInstance.isAccepted())){
return new ResponseEntity<>("Some of problems appeared. Check if you have access to given assignment and if it is accepted or the exchange has not been already added.", HttpStatus.BAD_REQUEST); return new ResponseEntity<>("Some of problems appeared. Check if you have access to given assignment and if it is accepted or the exchange has not been already added.", HttpStatus.BAD_REQUEST);
} }