From cb385dee61de9c5f052b9374d926f2332967c488 Mon Sep 17 00:00:00 2001 From: yetju000 Date: Sun, 15 Dec 2019 13:59:40 +0100 Subject: [PATCH 1/2] =?UTF-8?q?PUNKT-44=20naprawa=20b=C5=82=C4=99du=20doda?= =?UTF-8?q?wania=20testu=20do=20grupy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../studycaverestservice/model/studyGroup/GroupService.java | 3 ++- .../java/studycave/studycaverestservice/model/test/Test.java | 2 +- .../studycaverestservice/model/userActivity/UserActivity.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java index 3fcd41f..3505b96 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java @@ -406,7 +406,8 @@ public class GroupService { test.setStatus("UNVERIFIED"); } test.setGroup(group); - this.testRepository.save(test); + test.setActivity(new ArrayList<>()); + test = this.testRepository.save(test); this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, null, test); }); } diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/test/Test.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/test/Test.java index ff12c5b..ad36c36 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/test/Test.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/test/Test.java @@ -57,7 +57,7 @@ public class Test { private StudyGroup group; @OneToMany(fetch = FetchType.LAZY, mappedBy = "test", cascade = CascadeType.ALL) - private List activity; + private List activity = new ArrayList<>(); public void setAddDate() { java.util.Date utilDate = new java.util.Date(); diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/userActivity/UserActivity.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/userActivity/UserActivity.java index 3076c05..9c0f0c9 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/userActivity/UserActivity.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/userActivity/UserActivity.java @@ -46,7 +46,6 @@ public class UserActivity { private Set set; @ManyToOne - @JoinColumn(name = "test_id") private Test test; @ManyToOne From 1586d6a9294516ed567ec867ba4cbd678ee788de Mon Sep 17 00:00:00 2001 From: yetju000 Date: Sun, 15 Dec 2019 14:17:27 +0100 Subject: [PATCH 2/2] bugfix test score --- .../studycaverestservice/model/studyGroup/GroupService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java index 3505b96..98933c1 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java @@ -430,7 +430,7 @@ public class GroupService { long grade = 0; if (user != null){ for (UserActivity userActivity : t.getActivity()){ - if (userActivity.getToUser() != null && userActivity.getToUser().equals(user)){ + if (userActivity.getToUser() != null && userActivity.getToUser().equals(user) && userActivity.getType().equalsIgnoreCase("solvedTest")){ grade = userActivity.getPoints(); break; }