From 4d96bcf7a61ef5f1c5a1a0cb3a0b54957f7f667c Mon Sep 17 00:00:00 2001
From: "bojana.marojevikj" <bojana.marojevikj@finki.ukim.mk>
Date: Thu, 20 Mar 2025 09:41:05 +0100
Subject: [PATCH 1/2] return instructions in consultation response dto
---
.../finki/konsultacii/model/dtos/ConsultationResponseDto.java | 1 +
.../service/implementation/ConsultationServiceImpl.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/mk/ukim/finki/konsultacii/model/dtos/ConsultationResponseDto.java b/src/main/java/mk/ukim/finki/konsultacii/model/dtos/ConsultationResponseDto.java
index 6d681da..d24abdb 100644
--- a/src/main/java/mk/ukim/finki/konsultacii/model/dtos/ConsultationResponseDto.java
+++ b/src/main/java/mk/ukim/finki/konsultacii/model/dtos/ConsultationResponseDto.java
@@ -41,4 +41,5 @@ public class ConsultationResponseDto {
@JsonProperty("CourseID")
private Long courseID;
private String dateFormatted;
+ private String instructions;
}
diff --git a/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java b/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java
index 4c231e4..972d64e 100644
--- a/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java
+++ b/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java
@@ -135,7 +135,9 @@ public class ConsultationServiceImpl implements ConsultationService {
// courseID
null,
// dateFormatted
- consultation.getOneTimeDate().format(dateFormatter)
+ consultation.getOneTimeDate().format(dateFormatter),
+ // instructions
+ consultation.getStudentInstructions()
);
})
.collect(Collectors.toList());
--
GitLab
From a4d528c65ba13a0b671c610091c18be97beb9c87 Mon Sep 17 00:00:00 2001
From: "bojana.marojevikj" <bojana.marojevikj@finki.ukim.mk>
Date: Mon, 24 Mar 2025 13:37:21 +0100
Subject: [PATCH 2/2] compare upcoming consultations based on end time
---
.../service/implementation/ConsultationServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java b/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java
index 972d64e..9d87e5b 100644
--- a/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java
+++ b/src/main/java/mk/ukim/finki/konsultacii/service/implementation/ConsultationServiceImpl.java
@@ -273,9 +273,9 @@ public class ConsultationServiceImpl implements ConsultationService {
LocalDateTime now = LocalDateTime.now();
if ("UPCOMING".equalsIgnoreCase(time)) {
- spec = spec.and(isUpcoming(Consultation.class, "oneTimeDate", "startTime", now));
+ spec = spec.and(isUpcoming(Consultation.class, "oneTimeDate", "endTime", now));
} else if ("PAST".equalsIgnoreCase(time)) {
- spec = spec.and(isPast(Consultation.class, "oneTimeDate", "startTime", now));
+ spec = spec.and(isPast(Consultation.class, "oneTimeDate", "endTime", now));
}
Sort sort;
--
GitLab