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

Merge pull request 'gr_nr + sym' (#51) from new-response-fields into master

Browse Source 
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/51
This commit is contained in:
Marcin Woźniak 2021-01-22 16:20:34 +01:00
commit e688f8b71d
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java
View File

@ -42,6 +42,8 @@ public class GroupDefaultResponse {
@ApiModelProperty(value = "Used only in resposnes realted to user assignments. For example in /api/v1/users/schedule.") @ApiModelProperty(value = "Used only in resposnes realted to user assignments. For example in /api/v1/users/schedule.")
private Boolean isAccepted; private Boolean isAccepted;
private Integer grNr;
/** /**
* creat new entity * creat new entity
* *
@ -55,6 +57,14 @@ public class GroupDefaultResponse {
this.lecturer = group.getLecturer() != null ? group.getLecturer().toString() : ""; this.lecturer = group.getLecturer() != null ? group.getLecturer().toString() : "";
this.room = group.getRoom() != null ? group.getRoom() : ""; this.room = group.getRoom() != null ? group.getRoom() : "";
this.type = group.getType() != null ? GroupType.isLectureOrClass(group.getType()) : null; this.type = group.getType() != null ? GroupType.isLectureOrClass(group.getType()) : null;
this.grNr = group.getGrNr() != null ? group.getGrNr() : null;
}
/**
* @return group number
*/
public Integer getGrNr() {
return grNr;
} }
/** /**

9
restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java
View File

@ -9,6 +9,7 @@ public abstract class CoursesResponse {
private Long id; private Long id;
private String name; private String name;
private String symbol;
/** /**
* create instance * create instance
@ -18,6 +19,7 @@ public abstract class CoursesResponse {
public CoursesResponse(Course course) { public CoursesResponse(Course course) {
this.id = course.getId() != null ? course.getId() : null; this.id = course.getId() != null ? course.getId() : null;
this.name = course.getName() != null ? course.getName() : ""; this.name = course.getName() != null ? course.getName() : "";
this.symbol = course.getSymbol() != null ? course.getSymbol() : "";
} }
/** /**
@ -27,6 +29,13 @@ public abstract class CoursesResponse {
return name; return name;
} }
/**
* @return course symbol
*/
public String getSymbol() {
return symbol;
}
/** /**
* @return db id * @return db id
*/ */