From 389e55767468a8717b949d98841cc9e9f4912545 Mon Sep 17 00:00:00 2001 From: Filip Izydorczyk Date: Fri, 22 Jan 2021 12:34:54 +0100 Subject: [PATCH] gr_nr + sym --- .../responses/models/GroupDefaultResponse.java | 10 ++++++++++ .../responses/models/abstracts/CoursesResponse.java | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java index 7743560..ac9c08a 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java @@ -42,6 +42,8 @@ public class GroupDefaultResponse { @ApiModelProperty(value = "Used only in resposnes realted to user assignments. For example in /api/v1/users/schedule.") private Boolean isAccepted; + private Integer grNr; + /** * creat new entity * @@ -55,6 +57,14 @@ public class GroupDefaultResponse { this.lecturer = group.getLecturer() != null ? group.getLecturer().toString() : ""; this.room = group.getRoom() != null ? group.getRoom() : ""; 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; } /** diff --git a/restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java index 903a451..23ad2bc 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/abstracts/CoursesResponse.java @@ -9,6 +9,7 @@ public abstract class CoursesResponse { private Long id; private String name; + private String symbol; /** * create instance @@ -18,6 +19,7 @@ public abstract class CoursesResponse { public CoursesResponse(Course course) { this.id = course.getId() != null ? course.getId() : null; 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 course symbol + */ + public String getSymbol() { + return symbol; + } + /** * @return db id */