s416178
/
Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backend init fix

This commit is contained in:
yetju000 2019-11-25 13:39:53 +01:00
parent c92542ba2c
commit ad0a18c21d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BackEnd/src/main/java/studycave/studycaverestservice/controller/UploadController.java
View File

@ -170,7 +170,7 @@ public class UploadController {
materialDTO.setPermission(material.getPermission());
materialDTO.setOwner(username);
if(material.getGroup() != null )
if(material.getGroup().getId() != null )
if((long)material.getGroup().getId() != 0 )
materialDTO.setGroup(groupRepository.findById((long)material.getGroup().getId()).orElse(null).getName());
materialDTOs.add(materialDTO);
}

2
BackEnd/src/main/java/studycave/studycaverestservice/model/flashcardset/Set.java
View File

@ -52,7 +52,7 @@ public class Set {
@OneToMany(mappedBy="flashcardSet",cascade = CascadeType.ALL)
@JsonManagedReference
List<Flashcard> flashcards;
List<Flashcard> flashcards = new ArrayList<>();
@ManyToOne
@JoinColumn(name="group_id",referencedColumnName="id")

4
BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java
View File

@ -122,7 +122,7 @@ public class GroupService {
StudyGroup group = new StudyGroup();
group = this.groupRepository.findById(id).orElse(null);
GroupInfoDto groupInfo = new GroupInfoDto();
groupInfo.setId(group.getId());
groupInfo.setId((long)group.getId());
groupInfo.setName(group.getName());
groupInfo.setDescription(group.getDescription());
groupInfo.setGroupKey(group.getGroupKey());
@ -185,7 +185,7 @@ public class GroupService {
for (StudyGroupMember g : groups) {
SimpleStudyGroupMemberDTO s = new SimpleStudyGroupMemberDTO();
s.setName(g.getGroup().getName());
s.setId(g.getGroup().getId());
s.setId((long)g.getGroup().getId());
if (g.getIsGroupLeader() == true)
s.setRole("OWNER");
else

5
BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/StudyGroup.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import studycave.studycaverestservice.model.flashcardset.Set;
import studycave.studycaverestservice.model.studyGroupMember.StudyGroupMember;
import studycave.studycaverestservice.model.test.Test;
import studycave.studycaverestservice.model.userActivity.UserActivity;
@ -23,7 +24,7 @@ public class StudyGroup {
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private int id;
private String name;
@ -36,7 +37,7 @@ public class StudyGroup {
List<StudyGroupMember> members = new ArrayList<>();
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
List<StudyGroupMember> flashcardSets = new ArrayList<>();
List<Set> flashcardSets = new ArrayList<>();
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
List<Material> materials = new ArrayList<>();