Added info about commiter to comision entity
This commit is contained in:
parent
c62674b9d8
commit
dfae6d7c78
@ -24,6 +24,9 @@ public class Commision {
|
||||
@OneToOne
|
||||
@JoinColumn(name = "owner_id")
|
||||
private User commisionOwner;
|
||||
@OneToOne
|
||||
@JoinColumn(name = "commiter_id")
|
||||
private User commisionCommiter;
|
||||
private Timestamp commisionDate;
|
||||
|
||||
@OneToMany(mappedBy = "commision", fetch = FetchType.EAGER)
|
||||
@ -37,6 +40,17 @@ public class Commision {
|
||||
public Commision(User user) {
|
||||
this.commisionDate = new Timestamp(System.currentTimeMillis());
|
||||
this.commisionOwner = user;
|
||||
this.commisionCommiter = user;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param user user whose shedule is being commited
|
||||
* @param commiter user that commited new schedule
|
||||
*/
|
||||
public Commision(User user, User commiter) {
|
||||
this(user);
|
||||
this.commisionCommiter = commiter;
|
||||
}
|
||||
|
||||
public Commision() {
|
||||
@ -44,6 +58,7 @@ public class Commision {
|
||||
|
||||
/**
|
||||
* Id getter
|
||||
*
|
||||
* @return id id of commision
|
||||
*/
|
||||
public Long getId() {
|
||||
@ -52,6 +67,7 @@ public class Commision {
|
||||
|
||||
/**
|
||||
* CommisionDate getter
|
||||
*
|
||||
* @return commisionDate
|
||||
*/
|
||||
public Timestamp getCommisionDate() {
|
||||
@ -60,14 +76,26 @@ public class Commision {
|
||||
|
||||
/**
|
||||
* User of given commision getter
|
||||
*
|
||||
* @return User commisionOwner
|
||||
*/
|
||||
public User getCommisionOwner() {
|
||||
return commisionOwner;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return User entity that created commision (can be owner or deanery user)
|
||||
*/
|
||||
public User getCommisionCommiter() {
|
||||
if (commisionCommiter == null) {
|
||||
return commisionOwner;
|
||||
}
|
||||
return commisionCommiter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Assigments getter
|
||||
*
|
||||
* @return List of assignments
|
||||
*/
|
||||
public List<Assignment> getAssignments() {
|
||||
|
@ -82,7 +82,7 @@ public class CommisionController extends TokenBasedController {
|
||||
Assert.isTrue(!notExistingGroup.isPresent(), "Group "
|
||||
+ notExistingGroup.orElse(Long.MIN_VALUE).toString() + "doesn't exist");
|
||||
|
||||
final Commision com = new Commision(user);
|
||||
final Commision com = new Commision(user, asker);
|
||||
this.commisionService.save(com);
|
||||
|
||||
groups.stream().forEach((groupId) -> {
|
||||
|
@ -10,12 +10,29 @@ public class CommisionResponse {
|
||||
@ApiModelProperty(value = "ID created by database")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "ID of user that commision belongs to")
|
||||
private UserResponse owner;
|
||||
|
||||
@ApiModelProperty(value = "ID of user that created commision")
|
||||
private UserResponse commiter;
|
||||
|
||||
@ApiModelProperty(value = "Timestamp where the user commit the commision")
|
||||
private String commisionDate;
|
||||
|
||||
public CommisionResponse(Commision commision) {
|
||||
this.id = commision.getId();
|
||||
this.commisionDate = commision.getCommisionDate().toString();
|
||||
this.owner = commision.getCommisionOwner() != null ? new UserResponse(commision.getCommisionOwner()) : null;
|
||||
this.commiter = commision.getCommisionCommiter() != null ? new UserResponse(commision.getCommisionCommiter())
|
||||
: null;
|
||||
}
|
||||
|
||||
public UserResponse getCommiter() {
|
||||
return commiter;
|
||||
}
|
||||
|
||||
public UserResponse getOwner() {
|
||||
return owner;
|
||||
}
|
||||
|
||||
public String getCommisionDate() {
|
||||
|
Loading…
Reference in New Issue
Block a user