Skip to content

Commit 84e934c

Browse files
author
Daenges
committed
Rename Title to Module
1 parent f62d479 commit 84e934c

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

server/src/main/java/com/studybuddies/server/domain/MeetingEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class MeetingEntity {
3131
UUID superId;
3232

3333
@Column(nullable = false)
34-
String title;
34+
String module;
3535

3636
String description;
3737

server/src/main/java/com/studybuddies/server/services/meeting/MeetingCreationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void setEndTime() {
107107
private MeetingEntity cloneMeetingEntity(MeetingEntity meetingEntity) {
108108
return MeetingEntity.builder()
109109
.superId(meetingEntity.getSuperId())
110-
.title(meetingEntity.getTitle())
110+
.module(meetingEntity.getModule())
111111
.description(meetingEntity.getDescription())
112112
.dateFrom(meetingEntity.getDateFrom())
113113
.dateUntil(meetingEntity.getDateUntil())

server/src/main/java/com/studybuddies/server/web/dto/meeting/MeetingChangeRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class MeetingChangeRequest implements ChangeRequest {
1111

1212
public ChangeType changeType;
13-
public String title;
13+
public String module;
1414
public String description;
1515
public String dateFrom;
1616
public String dateUntil;

server/src/main/java/com/studybuddies/server/web/dto/meeting/MeetingCreationRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public class MeetingCreationRequest implements CreationRequest {
99

1010
@NotBlank
11-
public String title;
11+
public String module;
1212
public String description;
1313
@NotBlank
1414
public String dateFrom;

server/src/main/java/com/studybuddies/server/web/dto/meeting/MeetingResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class MeetingResponse implements Responses {
99
public String id;
1010
public String superId;
1111
@NotBlank
12-
public String title;
12+
public String module;
1313
public String description;
1414
@NotBlank
1515
public String dateFrom;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@Mapper(componentModel = "spring", uses = {MeetingMapperUtils.class})
1515
public interface MeetingMapper {
1616

17-
@Mapping(source = "title", target = "title", qualifiedByName = "assignExistingModule")
17+
@Mapping(source = "module", target = "module", qualifiedByName = "assignExistingModule")
1818
@Mapping(source = "description", target = "description")
1919
@Mapping(source = "place", target = "place")
2020
@Mapping(source = "dateFrom", target = "dateFrom", qualifiedByName = "stringToLocalDate")
@@ -25,7 +25,7 @@ MeetingEntity of(
2525

2626
@Mapping(source = "id", target = "id")
2727
@Mapping(source = "superId", target = "superId")
28-
@Mapping(source = "title", target = "title")
28+
@Mapping(source = "module", target = "module")
2929
@Mapping(source = "description", target = "description")
3030
@Mapping(source = "place", target = "place")
3131
@Mapping(source = "dateFrom", target = "dateFrom")
@@ -34,15 +34,15 @@ MeetingEntity of(
3434
@Mapping(source = "creator", target = "creator", qualifiedByName = "userEntityToUUIDString")
3535
MeetingResponse of(MeetingEntity meetingEntity);
3636

37-
@Mapping(source = "title", target = "title")
37+
@Mapping(source = "module", target = "module")
3838
@Mapping(source = "description", target = "description")
3939
@Mapping(source = "place", target = "place")
4040
@Mapping(source = "dateFrom", target = "dateFrom", qualifiedByName = "changeStringToLocalDate")
4141
@Mapping(source = "dateUntil", target = "dateUntil", qualifiedByName = "changeStringToLocalDate")
4242
@Mapping(source = "repeatable", target = "repeatable", qualifiedByName = "changeStringToRepeatEnum")
4343
MeetingEntity of(MeetingChangeRequest meetingChangeRequest);
4444

45-
@Mapping(source = "title", target = "title", qualifiedByName = "assignExistingModule")
45+
@Mapping(source = "module", target = "module", qualifiedByName = "assignExistingModule")
4646
@Mapping(source = "description", target = "description")
4747
@Mapping(source = "place", target = "place")
4848
@Mapping(source = "dateFrom", target = "dateFrom", qualifiedByName = "localDateTimeToString")

server/src/test/java/com/studybuddies/server/services/MeetingServiceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MeetingServiceTest {
4646
void createMeetingsTest_invalidRepeatable_throwsException() {
4747
// given
4848
MeetingCreationRequest mockMeeting = new MeetingCreationRequest();
49-
mockMeeting.setTitle("Invalid Repeatable Meeting");
49+
mockMeeting.setModule("Invalid Repeatable Meeting");
5050
mockMeeting.setDescription("Meeting with invalid repeatable value.");
5151
mockMeeting.setPlace("");
5252
mockMeeting.setRepeatable("invalid_value");
@@ -72,7 +72,7 @@ void createMeetingsTest_invalidRepeatable_throwsException() {
7272
void createMeetings_success() {
7373
// given
7474
MeetingCreationRequest mockMeeting = new MeetingCreationRequest();
75-
mockMeeting.setTitle("Valid Meeting");
75+
mockMeeting.setModule("Valid Meeting");
7676
mockMeeting.setDescription("");
7777
mockMeeting.setPlace("");
7878
mockMeeting.setRepeatable("NEVER");
@@ -155,19 +155,19 @@ void updateTest_updatesOnlyNonNullFields() {
155155
mockUser.setUuid(UUID.randomUUID());
156156
UUID meetingId = UUID.randomUUID();
157157
MeetingEntity existingMeeting = new MeetingEntity();
158-
existingMeeting.setTitle("Old Title");
158+
existingMeeting.setModule("Old Module");
159159
existingMeeting.setDescription("Old Description");
160160
existingMeeting.setPlace("Old Place");
161161
existingMeeting.setCreator(mockUser);
162162

163163
MeetingChangeRequest mockChangeRequest = new MeetingChangeRequest();
164-
mockChangeRequest.setTitle("New Title"); // Should be updated
164+
mockChangeRequest.setModule("New Module"); // Should be updated
165165
mockChangeRequest.setDescription(null); // Should NOT be updated
166166
mockChangeRequest.setPlace(null); // Should NOT be updated
167167
mockChangeRequest.setChangeType(ChangeType.OCCURRENCE);
168168

169169
MeetingEntity changedMeeting = new MeetingEntity();
170-
changedMeeting.setTitle("New Title");
170+
changedMeeting.setModule("New Module");
171171
changedMeeting.setDescription(null);
172172
changedMeeting.setPlace(null);
173173

@@ -179,7 +179,7 @@ void updateTest_updatesOnlyNonNullFields() {
179179
meetingService.update(meetingId.toString(), mockChangeRequest, mockUser.getUuid().toString());
180180

181181
// then
182-
assertEquals("New Title", existingMeeting.getTitle()); // Updated
182+
assertEquals("New Module", existingMeeting.getModule()); // Updated
183183
assertEquals("Old Description", existingMeeting.getDescription()); // Not updated
184184
assertEquals("Old Place", existingMeeting.getPlace()); // Not updated
185185

0 commit comments

Comments
 (0)