Merge branch 'dev' into 129-ta-statistics-star-rating

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Queue feedback rating link replaced with actual rating. @dsavvidi
+- Job offer applications are sorted based on the time of application @dsavvidi
 
 ### Fixed
 

build.gradle.kts

@@ -4,12 +4,12 @@ import nl.javadude.gradle.plugins.license.DownloadLicensesExtension
 import nl.javadude.gradle.plugins.license.LicenseExtension
 
 group = "nl.tudelft.tam"
-version = "2.1.7"
+version = "2.2.1"
 
 val javaVersion = JavaVersion.VERSION_17
 
-val labradoorVersion = "1.4.1-SNAPSHOT"
-val libradorVersion = "1.2.1"
+val labradoorVersion = "1.4.1"
+val libradorVersion = "1.3.0"
 val chihuahUIVersion = "1.0.0"
 val guavaVersion = "32.1.1-jre"
 val modelMapperVersion = "3.1.0"
@@ -59,11 +59,11 @@ plugins {
 
     // Spring plugins for managing dependencies and creating
     // a nice Spring Boot application.
-    id("org.springframework.boot").version("2.7.14")
-    id("io.spring.dependency-management").version("1.1.3")
+    id("org.springframework.boot").version("2.7.18")
+    id("io.spring.dependency-management").version("1.1.4")
 
     // Spotless plugin for checking style of Java code.
-    id("com.diffplug.spotless").version("6.21.0")
+    id("com.diffplug.spotless").version("6.23.3")
 
     // Plugin for checking license headers within our code and files.
     id("com.github.hierynomus.license").version("0.16.1")
@@ -71,7 +71,7 @@ plugins {
 
     // Plugin to provide task to check the current versions of
     // dependencies and of Gradle to see if updates are available.
-    id("com.github.ben-manes.versions").version("0.47.0")
+    id("com.github.ben-manes.versions").version("0.50.0")
 
 	id("com.unclezs.gradle.sass").version("1.0.10")
 }
@@ -252,7 +252,6 @@ dependencies {
     // Other Spring dependencies
     implementation("org.springframework:spring-web")
     implementation("org.springframework.security:spring-security-messaging")
-    implementation("org.springdoc:springdoc-openapi-ui:$springDocVersion")
 
     // Thymeleaf layout dialect
     implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")

src/main/java/nl/tudelft/tam/cache/EditionRolesCacheManager.java

@@ -18,6 +18,7 @@
 package nl.tudelft.tam.cache;
 
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,10 +64,10 @@ public class EditionRolesCacheManager extends CoreCacheManager<Long, EditionRole
 	}
 
 	@Override
-	protected List<RoleHolder> fetch(List<Long> ids) {
+	protected Set<RoleHolder> fetch(Set<Long> ids) {
 		return ids.stream()
 				.map(id -> new RoleHolder(id, eApi.getEditionParticipants(id).collectList().block()))
-				.collect(Collectors.toList());
+				.collect(Collectors.toSet());
 	}
 
 	@Override

src/main/java/nl/tudelft/tam/dto/view/summary/ApplicationSummaryDTO.java

@@ -17,7 +17,7 @@
  */
 package nl.tudelft.tam.dto.view.summary;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -38,7 +38,7 @@ public class ApplicationSummaryDTO extends View<Application> {
 
 	private String content;
 
-	private LocalDate createdDate;
+	private LocalDateTime createdDate;
 
 	@Builder.Default
 	private Status status = Status.SUBMITTED;

src/main/java/nl/tudelft/tam/model/Application.java

@@ -18,7 +18,7 @@
 package nl.tudelft.tam.model;
 
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -76,21 +76,21 @@ public class Application {
 	@NotNull
 	@Builder.Default
 	@Column(columnDefinition = "DATE")
-	private LocalDate createdDate = LocalDate.now();
+	private LocalDateTime createdDate = LocalDateTime.now();
 
 	@NotNull
 	@Builder.Default
 	@Column(columnDefinition = "DATE")
-	private LocalDate lastModifiedDate = LocalDate.now();
+	private LocalDateTime lastModifiedDate = LocalDateTime.now();
 
 	@PreUpdate
 	public void setLastModifiedDate() {
-		this.lastModifiedDate = LocalDate.now();
+		this.lastModifiedDate = LocalDateTime.now();
 	}
 
 	@PrePersist
 	public void setCreatedDate() {
-		this.createdDate = LocalDate.now();
+		this.createdDate = LocalDateTime.now();
 	}
 
 }

src/test/java/nl/tudelft/tam/controller/JobOfferControllerTest.java

@@ -153,11 +153,11 @@ class JobOfferControllerTest {
 				.deadline(LocalDate.now().plusDays(1)).build();
 
 		app1a = ApplicationSummaryDTO.builder().personId(PERSON_ID_1).jobOfferId(JOFFER_ID_1)
-				.status(Status.SUBMITTED).createdDate(LocalDate.now()).build();
+				.status(Status.SUBMITTED).createdDate(LocalDateTime.now()).build();
 		app1b = ApplicationSummaryDTO.builder().personId(PERSON_ID_2).jobOfferId(JOFFER_ID_1)
-				.status(Status.OFFERED).createdDate(LocalDate.now()).build();
+				.status(Status.OFFERED).createdDate(LocalDateTime.now()).build();
 		app2a = ApplicationSummaryDTO.builder().personId(PERSON_ID_1).jobOfferId(JOFFER_ID_2)
-				.status(Status.REJECTED_BY_STUDENT).createdDate(LocalDate.now()).build();
+				.status(Status.REJECTED_BY_STUDENT).createdDate(LocalDateTime.now()).build();
 
 		JobOfferDefault joDefault = JobOfferDefault.builder().contractName("TEST JO")
 				.contractBaanCode("TEST BAAN JO").contractStartDate(LocalDate.now())