backend init fix
This commit is contained in:
parent
c92542ba2c
commit
ad0a18c21d
|
@ -170,7 +170,7 @@ public class UploadController {
|
||||||
materialDTO.setPermission(material.getPermission());
|
materialDTO.setPermission(material.getPermission());
|
||||||
materialDTO.setOwner(username);
|
materialDTO.setOwner(username);
|
||||||
if(material.getGroup() != null )
|
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());
|
materialDTO.setGroup(groupRepository.findById((long)material.getGroup().getId()).orElse(null).getName());
|
||||||
materialDTOs.add(materialDTO);
|
materialDTOs.add(materialDTO);
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class Set {
|
||||||
|
|
||||||
@OneToMany(mappedBy="flashcardSet",cascade = CascadeType.ALL)
|
@OneToMany(mappedBy="flashcardSet",cascade = CascadeType.ALL)
|
||||||
@JsonManagedReference
|
@JsonManagedReference
|
||||||
List<Flashcard> flashcards;
|
List<Flashcard> flashcards = new ArrayList<>();
|
||||||
|
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
@JoinColumn(name="group_id",referencedColumnName="id")
|
@JoinColumn(name="group_id",referencedColumnName="id")
|
||||||
|
|
|
@ -122,7 +122,7 @@ public class GroupService {
|
||||||
StudyGroup group = new StudyGroup();
|
StudyGroup group = new StudyGroup();
|
||||||
group = this.groupRepository.findById(id).orElse(null);
|
group = this.groupRepository.findById(id).orElse(null);
|
||||||
GroupInfoDto groupInfo = new GroupInfoDto();
|
GroupInfoDto groupInfo = new GroupInfoDto();
|
||||||
groupInfo.setId(group.getId());
|
groupInfo.setId((long)group.getId());
|
||||||
groupInfo.setName(group.getName());
|
groupInfo.setName(group.getName());
|
||||||
groupInfo.setDescription(group.getDescription());
|
groupInfo.setDescription(group.getDescription());
|
||||||
groupInfo.setGroupKey(group.getGroupKey());
|
groupInfo.setGroupKey(group.getGroupKey());
|
||||||
|
@ -185,7 +185,7 @@ public class GroupService {
|
||||||
for (StudyGroupMember g : groups) {
|
for (StudyGroupMember g : groups) {
|
||||||
SimpleStudyGroupMemberDTO s = new SimpleStudyGroupMemberDTO();
|
SimpleStudyGroupMemberDTO s = new SimpleStudyGroupMemberDTO();
|
||||||
s.setName(g.getGroup().getName());
|
s.setName(g.getGroup().getName());
|
||||||
s.setId(g.getGroup().getId());
|
s.setId((long)g.getGroup().getId());
|
||||||
if (g.getIsGroupLeader() == true)
|
if (g.getIsGroupLeader() == true)
|
||||||
s.setRole("OWNER");
|
s.setRole("OWNER");
|
||||||
else
|
else
|
||||||
|
|
|
@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
|
import studycave.studycaverestservice.model.flashcardset.Set;
|
||||||
import studycave.studycaverestservice.model.studyGroupMember.StudyGroupMember;
|
import studycave.studycaverestservice.model.studyGroupMember.StudyGroupMember;
|
||||||
import studycave.studycaverestservice.model.test.Test;
|
import studycave.studycaverestservice.model.test.Test;
|
||||||
import studycave.studycaverestservice.model.userActivity.UserActivity;
|
import studycave.studycaverestservice.model.userActivity.UserActivity;
|
||||||
|
@ -23,7 +24,7 @@ public class StudyGroup {
|
||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
private int id;
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
@ -36,7 +37,7 @@ public class StudyGroup {
|
||||||
List<StudyGroupMember> members = new ArrayList<>();
|
List<StudyGroupMember> members = new ArrayList<>();
|
||||||
|
|
||||||
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
||||||
List<StudyGroupMember> flashcardSets = new ArrayList<>();
|
List<Set> flashcardSets = new ArrayList<>();
|
||||||
|
|
||||||
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
||||||
List<Material> materials = new ArrayList<>();
|
List<Material> materials = new ArrayList<>();
|
||||||
|
|
Loading…
Reference in New Issue