Skip to content

Commit c8f7c9b

Browse files
authored
Merge pull request #16 from Halbes-Byte/tests
fix for meeting
2 parents 2fb3d3a + c7c7035 commit c8f7c9b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

server/src/main/java/com/studybuddies/server/services/MeetingService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void changeMeetingInDatabase(Long id, MeetingChangeRequest meetingChangeR
4242
meetingChangeRequest);
4343

4444
setIfNotNull(changedMeeting.getTitle(), meetingEntity::setTitle);
45-
setIfNotNull(changedMeeting.getLinks(), meetingEntity::setLinks);
4645
setIfNotNull(changedMeeting.getDescription(), meetingEntity::setDescription);
4746
setIfNotNull(changedMeeting.getDate_from(), meetingEntity::setDate_from);
4847
setIfNotNull(changedMeeting.getDate_until(), meetingEntity::setDate_until);

server/src/main/java/com/studybuddies/server/web/mapper/MeetingMapper.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,23 @@ public interface MeetingMapper {
2323

2424
MeetingEntity MeetingCreationRequestToMeetingEntity(MeetingCreationRequest meetingCreationRequest);
2525

26-
// Mappings for MeetingChangeRequestToMeetingEntity
2726
@Mapping(source = "id", target = "id")
2827
@Mapping(source = "title", target = "title")
2928
@Mapping(source = "description", target = "description")
3029
@Mapping(source = "place", target = "place")
30+
@Mapping(source = "date_from", target = "date_from")
31+
@Mapping(source = "date_until", target = "date_until")
32+
@Mapping(source = "repeatable", target = "repeatable")
33+
MeetingResponse MeetingEntityToMeetingResponse(MeetingEntity meetingEntity);
34+
35+
// Mappings for MeetingChangeRequestToMeetingEntity
36+
@Mapping(source = "title", target = "title")
37+
@Mapping(source = "description", target = "description")
38+
@Mapping(source = "place", target = "place")
3139
@Mapping(source = "date_from", target = "date_from", qualifiedByName = "changeStringToLocalDate")
3240
@Mapping(source = "date_until", target = "date_until", qualifiedByName = "changeStringToLocalDate")
3341
@Mapping(source = "repeatable", target = "repeatable", qualifiedByName = "stringToRepeatEnum")
3442
MeetingEntity MeetingChangeRequestToMeetingEntity(MeetingChangeRequest meetingChangeRequest);
35-
MeetingResponse MeetingEntityToMeetingResponse(MeetingEntity meetingEntity);
3643

3744
@AfterMapping
3845
default void validate(@MappingTarget MeetingEntity meetingEntity) {

0 commit comments

Comments
 (0)