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

Checkpoint: added performExchange

Browse Source
This commit is contained in:
Marcin Woźniak
2021-01-12 14:10:48 +01:00
parent 1c12a778af
commit bc8f7407fc
4 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
buisnesslogic/src/main/java/com/plannaplan/entities/Assignment.java
View File

@ -10,7 +10,7 @@ import javax.persistence.ManyToOne;
/**
* Entity of Assignment grouping of state associated about group_id and
* commision_id
*
*
*/
@Entity
@ -28,7 +28,7 @@ public class Assignment {
/**
* Assignment
*
*
* @param group group we would like to assign
* @param commision commision that assignment belongs to
* @param isPastAssignment is assignment past or no
@ -40,14 +40,14 @@ public class Assignment {
/**
* If it returns trues it mesans u are assigned to group accepted by algorythm
*
*
* @return boolean isAccepted
*/
public boolean isAccepted() {
return this.group.getRegisteredStudents().contains(this.commision.getCommisionOwner());
}
/**
/**
* Getter of commision
* @return Commision Commision of given assignments
*/
@ -57,7 +57,7 @@ public class Assignment {
/**
* Assignment
*
*
* @param group group we would like to assign
* @param commision commision that assignment belongs to
*/
@ -68,9 +68,12 @@ public class Assignment {
public Assignment() {
}
public void setCommision(Commision commision) {
this.commision = commision;
}
/**
* Id getter
*
*
* @return id id of assignment
*/
@ -80,7 +83,7 @@ public class Assignment {
/**
* getGroup
*
*
* @return group
*/
public Groups getGroup() {
@ -89,7 +92,7 @@ public class Assignment {
/**
* isPastAssignment getter
*
*
* @return isPastAssignment
*/
public boolean isPastAssignment() {
@ -98,10 +101,10 @@ public class Assignment {
/**
* setter isPastAssignment
*
*
* @param isPastAssignment is assignment past or not
*/
public void setPastAssignment(boolean isPastAssignment) {
this.isPastAssignment = isPastAssignment;
}
}
}

45
buisnesslogic/src/main/java/com/plannaplan/entities/User.java
View File

@ -47,6 +47,11 @@ public class User {
return this.studentRegisteredGrups;
}
public void removeGroup(Long id) {
final Groups groupToDelete = this.studentRegisteredGrups.stream().filter(e -> e.getId().equals(id)).findFirst().get();
this.studentRegisteredGrups.remove(groupToDelete);
}
public void claimGroup(Groups group) {
if (this.studentRegisteredGrups == null) {
this.studentRegisteredGrups = new HashSet<>();
@ -58,7 +63,7 @@ public class User {
}
/**
*
*
* @param name name given to the user
* @param surname surname given to the user
* @param mail mail given to the user
@ -72,7 +77,7 @@ public class User {
}
/**
*
*
* @param name name given to the user
* @param surname surname given to the user
* @param mail mail given to the user
@ -85,7 +90,7 @@ public class User {
}
/**
*
*
* @param name name given to the user
* @param surname surname given to the user
* @param mail mail given to the user
@ -101,7 +106,7 @@ public class User {
/**
* usos id getter
*
*
* @return usosid
*/
public String getUsosId() {
@ -110,7 +115,7 @@ public class User {
/**
* email getter
*
*
* @return mailof user
*/
public String getEmail() {
@ -119,7 +124,7 @@ public class User {
/**
* email setter
*
*
* @param email user email
*/
public void setEmail(String email) {
@ -128,7 +133,7 @@ public class User {
/**
* token usage getter
*
*
* @return Timestamp when token was used
*/
public Timestamp getTokenUsageDate() {
@ -137,7 +142,7 @@ public class User {
/**
* token getter
*
*
* @return user token
*/
public String getToken() {
@ -153,7 +158,7 @@ public class User {
/**
* token seter. Sets token and automaticly set time when was set
*
*
* @param token token to set
*/
public void setToken(String token) {
@ -164,7 +169,7 @@ public class User {
/**
* name setter
*
*
* @return String user name
*/
public String getName() {
@ -173,7 +178,7 @@ public class User {
/**
* user rolse getter
*
*
* @return UserRoles of user
*/
public UserRoles getRole() {
@ -182,7 +187,7 @@ public class User {
/**
* user role setter
*
*
* @param role to be set
*/
public void setRole(UserRoles role) {
@ -191,7 +196,7 @@ public class User {
/**
* surname getter
*
*
* @return string surname
*/
public String getSurname() {
@ -200,7 +205,7 @@ public class User {
/**
* surname setter
*
*
* @param surname string to be set as surnames
*/
public void setSurname(String surname) {
@ -209,7 +214,7 @@ public class User {
/**
* name stter
*
*
* @param name stirng to be set as name
*/
public void setName(String name) {
@ -218,7 +223,7 @@ public class User {
/**
* id getter
*
*
* @return id in database
*/
public Long getId() {
@ -227,7 +232,7 @@ public class User {
/**
* Ranking points are [100;500]. It's calculated by gradesAvg*100*studiesYear
*
*
* @return ranking points [100;500]
*/
public Integer getRanking() {
@ -237,7 +242,7 @@ public class User {
/**
* Ranking points setter. Ranking points are [100;500]. It's calculated by
* gradesAvg*100*studiesYear
*
*
* @param ranking ranking points [100;500]
*/
public void setRanking(Integer ranking) {
@ -246,7 +251,7 @@ public class User {
/**
* updates user entity with data got by UsosApiService::getUserData
*
*
* @param usosData UserApiResponse model with needed data
*/
public void updateWithUsosData(UserApiResponse usosData) {
@ -257,7 +262,7 @@ public class User {
/**
* it checks if given ammount of time passed since last token usage. If not
* retunr true and reset time otherwise return false and token won work anymore
*
*
* @return boolena if credentials (token) is expired or not
*/
public boolean isCredentialsNonExpired() {