Merge branch...

Merge branch '163-https-sentry-ewi-tudelft-nl-organizations-eip-issues-2351-project-8-query-is-3aunresolved' into 'development'

Resolve "https://sentry.ewi.tudelft.nl/organizations/eip/issues/2351/?project=8&query=is%3Aunresolved"

Closes #163

See merge request !236

src/main/java/nl/tudelft/submit/model/CoreSubmission.java

@@ -17,6 +17,7 @@
  */
 package nl.tudelft.submit.model;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 
 import lombok.*;
@@ -31,6 +32,7 @@ import lombok.experimental.SuperBuilder;
 @EqualsAndHashCode(callSuper = true)
 public class CoreSubmission extends AbstractSubmitSubmission {
 
+	@Column(unique = true)
 	private Long coreSubmissionId;
 
 }

src/main/java/nl/tudelft/submit/service/SubmissionService.java

@@ -24,6 +24,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 import org.modelmapper.ModelMapper;
@@ -102,6 +104,10 @@ public class SubmissionService {
 
 	private final ModelMapper mapper = new ModelMapper();
 
+	// Locks for synchronisation
+	private final ReentrantLock lockMapLock = new ReentrantLock();
+	private final Map<Long, ReentrantLock> submissionLocks = new ConcurrentHashMap<>();
+
 	/**
 	 * Returns a SubmissionViewDTO of the Submission of the given ID.
 	 *
@@ -131,8 +137,15 @@ public class SubmissionService {
 	@Transactional
 	public Long addSubmission(SubmissionCreateDTO createDTO) {
 		Long id = submissionApi.addSubmission(createDTO).block();
+		// Be the only one to modify this submission
+		ReentrantLock lock = acquireSubmissionLock(id);
+		try {
+			lock.lock();
 			submissionRepository.deleteAllByCoreSubmissionId(id);
 			submissionRepository.saveAndFlush(CoreSubmission.builder().coreSubmissionId(id).build());
+		} finally {
+			lock.unlock();
+		}
 		return id;
 	}
 
@@ -542,6 +555,28 @@ public class SubmissionService {
 		return submissions;
 	}
 
+	/**
+	 * Gets a lock for the given core submission. If a lock is returned and locked successfully, the core
+	 * submission cannot be modified by other threads.
+	 *
+	 * @param  coreSubmissionId The id of the core submission
+	 * @return                  The lock to gain access
+	 */
+	private ReentrantLock acquireSubmissionLock(Long coreSubmissionId) {
+		ReentrantLock lock;
+		try {
+			lockMapLock.lock();
+			// Get submission lock for this submission, or create if does not exist
+			if (!submissionLocks.containsKey(coreSubmissionId)) {
+				submissionLocks.put(coreSubmissionId, new ReentrantLock());
+			}
+			lock = submissionLocks.get(coreSubmissionId);
+			return lock;
+		} finally {
+			lockMapLock.unlock();
+		}
+	}
+
 	/**
 	 * Gets the submit core submission with the corresponding id or creates one.
 	 *
@@ -550,9 +585,18 @@ public class SubmissionService {
 	 */
 	@Transactional
 	public CoreSubmission getOrCreateSubmitCoreSubmission(Long submissionId) {
-		return submissionRepository.findByCoreSubmissionId(submissionId).orElseGet(
-				() -> submissionRepository
-						.save(CoreSubmission.builder().coreSubmissionId(submissionId).build()));
+		ReentrantLock lock = acquireSubmissionLock(submissionId);
+
+		// At this point, another thread might also have gotten the lock from the map
+		// Be the only one to create this submission
+		try {
+			lock.lock();
+			Optional<CoreSubmission> existing = submissionRepository.findByCoreSubmissionId(submissionId);
+			return existing.orElseGet(() -> submissionRepository
+					.saveAndFlush(CoreSubmission.builder().coreSubmissionId(submissionId).build()));
+		} finally {
+			lock.unlock();
+		}
 	}
 
 	/**

src/main/resources/migrations.yaml

@@ -747,3 +747,14 @@ databaseChangeLog:
             comment: Delete and drop submit_submission table.
             sql: delete from submit_submission;
               drop table submit_submission;
+
+  # Prevent duplicate core submissions
+  - changeSet:
+      id: 1710252596737-1
+      author: ruben (generated)
+      changes:
+        - addUniqueConstraint:
+            columnNames: core_submission_id
+            constraintName: UK_p00vxxysmhvlxbqgkfx93gcvc
+            tableName: core_submission
+