From 9fb3f26341647229f26536532f11d88c3c49f73b Mon Sep 17 00:00:00 2001
From: Iga Bartosz Collins <igabar@st.amu.edu.pl>
Date: Tue, 31 Jan 2023 12:45:41 +0100
Subject: [PATCH] Added person id in GroupMemberDto.

---
 src/main/java/com/example/demo/dto/GroupMemberDto.java  | 6 +++++-
 src/main/java/com/example/demo/model/GroupMember.java   | 4 ++--
 src/main/java/com/example/demo/model/StudentsGroup.java | 4 ++--
 src/main/webapp/src/app/model/groupMember.ts            | 8 +++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/dto/GroupMemberDto.java b/src/main/java/com/example/demo/dto/GroupMemberDto.java
index 581b191..2a74d30 100644
--- a/src/main/java/com/example/demo/dto/GroupMemberDto.java
+++ b/src/main/java/com/example/demo/dto/GroupMemberDto.java
@@ -7,19 +7,23 @@ import java.io.Serializable;
 @Data
 public class GroupMemberDto implements Serializable {
 
-    public GroupMemberDto(Long id, Long studentId, Long groupId) {
+    public GroupMemberDto(Long id, Long studentId, Long groupId, Long personId) {
         this.id = id;
         this.studentId = studentId;
         this.groupId = groupId;
+        this.personId = personId;
     }
 
     public GroupMemberDto() {
         this.id = null;
         this.studentId = null;
         this.groupId = null;
+        this.personId = null;
     }
 
     private final Long id;
     private final Long studentId;
     private final Long groupId;
+
+    private final Long personId;
 }
diff --git a/src/main/java/com/example/demo/model/GroupMember.java b/src/main/java/com/example/demo/model/GroupMember.java
index 75745eb..97c5a06 100644
--- a/src/main/java/com/example/demo/model/GroupMember.java
+++ b/src/main/java/com/example/demo/model/GroupMember.java
@@ -54,7 +54,7 @@ public class GroupMember {
         return new GroupMemberDto(
                 getId(),
                 getStudent().getId(),
-                getGroup().getId()
-        );
+                getGroup().getId(),
+                getStudent().getPerson().getId());
     }
 }
diff --git a/src/main/java/com/example/demo/model/StudentsGroup.java b/src/main/java/com/example/demo/model/StudentsGroup.java
index f1f1415..a5c63b3 100644
--- a/src/main/java/com/example/demo/model/StudentsGroup.java
+++ b/src/main/java/com/example/demo/model/StudentsGroup.java
@@ -85,8 +85,8 @@ public class StudentsGroup {
             GroupMemberDto groupMemberDto = new GroupMemberDto(
                     groupMember.getId(),
                     groupMember.getStudent().getId(),
-                    getId()
-            );
+                    getId(),
+                    groupMember.getStudent().getPerson().getId());
             studentsGroupDto.getGroupMembers().add(groupMemberDto);
         });
         return studentsGroupDto;
diff --git a/src/main/webapp/src/app/model/groupMember.ts b/src/main/webapp/src/app/model/groupMember.ts
index fdd96a4..1d4ef0e 100644
--- a/src/main/webapp/src/app/model/groupMember.ts
+++ b/src/main/webapp/src/app/model/groupMember.ts
@@ -1,11 +1,13 @@
 export class GroupMember {
-  id: number;
+  id: number | null;
   studentId: number;
-  groupId: number;
+  groupId: number | null;
+  personId: number;
 
-  constructor(id: number, studentId: number, groupId: number) {
+  constructor(id: number | null, studentId: number, groupId: number | null, personId: number) {
     this.id = id;
     this.studentId = studentId;
     this.groupId = groupId;
+    this.personId = personId;
   }
 }