Merge branch 'dev' into feature/submission-send

Author: StInvestigator

.github/workflows/main.yml

@@ -11,6 +11,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
+  FRONTEND_REF: dev
 
 jobs:
   build:
@@ -73,9 +74,22 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: ita-social-projects/oitClient
-          ref: dev
+          ref: ${{ env.FRONTEND_REF }}
           path: frontend
 
+      - name: Capture frontend build metadata
+        run: |
+          COMMIT_ID=$(git -C frontend rev-parse HEAD)
+          COMMIT_TIME=$(date -u -d "$(git -C frontend log -1 --format=%cI)" +%Y-%m-%dT%H:%M:%SZ)
+          VERSION=$(node -p "require('./frontend/package.json').version || ''")
+          {
+            echo "oit.frontend.commit-id=$COMMIT_ID"
+            echo "oit.frontend.short-commit-id=${COMMIT_ID:0:7}"
+            echo "oit.frontend.commit-time=$COMMIT_TIME"
+            echo "oit.frontend.branch=$FRONTEND_REF"
+            echo "oit.frontend.version=$VERSION"
+          } > src/main/resources/frontend-info.properties
+
       - name: Build frontend
         run: |
           cd frontend

.gitignore

@@ -41,4 +41,7 @@ build/
 .vscode/
 
 myenv-example
-/.env
+/.env
+
+# Generated by CI during the backend image build
+src/main/resources/frontend-info.properties

pom.xml

@@ -281,6 +281,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>build-info</id>
+                        <goals>
+                            <goal>build-info</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <excludes>
                         <exclude>
@@ -290,6 +298,23 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+                <configuration>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+                    <verbose>false</verbose>
+                    <dateFormat>yyyy-MM-dd'T'HH:mm:ssXXX</dateFormat>
+                    <dateFormatTimeZone>UTC</dateFormatTimeZone>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.branch$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/com/itasocialacademy/oitassist/competition/api/CompetitionFacade.java

@@ -59,4 +59,15 @@ public interface CompetitionFacade {
      * @return the competition tree, or empty if no competition with this ID exists
      */
     Optional<CompetitionTreeDetail> findCompetitionTreeByCompetitionId(Long competitionId);
+
+    /**
+     * Retrieves tours by their IDs.
+     *
+     * @param tourIds Tour IDs, must not be {@code null} (an empty list yields an
+     *                empty result)
+     * @return the tours found for the given IDs, in unspecified order; IDs with no
+     *         matching tour are silently omitted, so the result may be smaller than
+     *         {@code tourIds}
+     */
+    List<TourDetail> findToursByIds(List<Long> tourIds);
 }

src/main/java/com/itasocialacademy/oitassist/competition/controller/CompetitionController.java

@@ -143,13 +143,17 @@ public ResponseEntity<CompetitionTreeResponse> getCompetitionTree(@PathVariable
         @ApiResponse(responseCode = "403", description = "Access denied (requires ADMIN or ORG role)",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
         @ApiResponse(responseCode = "404", description = "Competition not found",
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
+        @ApiResponse(responseCode = "409",
+            description = "Conflict — the entity was modified by another request since it was last read "
+                + "(stale version)",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PatchMapping("/{competitionId}/status")
     @PreAuthorize("hasAnyRole('ADMIN', 'ORG')")
     public ResponseEntity<CompetitionResponse> changeStatus(
         @PathVariable Long competitionId,
         @Valid @RequestBody ChangeCompetitionStatusRequest request) {
-        return ResponseEntity.ok(competitionService.changeStatus(competitionId, request.status()));
+        return ResponseEntity.ok(competitionService.changeStatus(competitionId, request));
     }
 }

src/main/java/com/itasocialacademy/oitassist/competition/controller/StageController.java

@@ -84,6 +84,10 @@ public ResponseEntity<List<StageResponse>> getAllStages(@PathVariable Long compe
         @ApiResponse(responseCode = "403", description = "Access denied",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
         @ApiResponse(responseCode = "404", description = "Stage not found",
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
+        @ApiResponse(responseCode = "409",
+            description = "Conflict — the entity was modified by another request since it was last read "
+                + "(stale version)",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PutMapping("/competitions/{competitionId}/stages/{stageId}")
@@ -105,6 +109,10 @@ public ResponseEntity<StageResponse> updateStage(
         @ApiResponse(responseCode = "403", description = "Access denied",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
         @ApiResponse(responseCode = "404", description = "Stage not found",
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
+        @ApiResponse(responseCode = "409",
+            description = "Conflict — the entity was modified by another request since it was last read "
+                + "(stale version)",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PreAuthorize("hasAnyRole('ADMIN', 'ORG')")

src/main/java/com/itasocialacademy/oitassist/competition/controller/TourController.java

@@ -79,7 +79,11 @@ public ResponseEntity<List<TourResponse>> getAllTours(@PathVariable Long stageId
         @ApiResponse(responseCode = "403", description = "Access denied",
             content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
         @ApiResponse(responseCode = "404", description = "Tour not found",
-            content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+            content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+        @ApiResponse(responseCode = "409",
+            description = "Conflict — the entity was modified by another request since it was last read "
+                + "(stale version)",
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PutMapping("/stages/{stageId}/tours/{tourId}")
     @PreAuthorize("hasAnyRole('ADMIN', 'ORG')")
@@ -98,7 +102,11 @@ public ResponseEntity<TourResponse> updateTour(
         @ApiResponse(responseCode = "403", description = "Access denied",
             content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))),
         @ApiResponse(responseCode = "404", description = "Tour not found",
-            content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+            content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+        @ApiResponse(responseCode = "409",
+            description = "Conflict — the entity was modified by another request since it was last read "
+                + "(stale version)",
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PatchMapping("/stages/{stageId}/tours/{tourId}/status")
     @PreAuthorize("hasAnyRole('ADMIN', 'ORG')")

src/main/java/com/itasocialacademy/oitassist/competition/dao/model/CompetitionEvent.java

@@ -6,6 +6,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import lombok.AllArgsConstructor;
@@ -58,4 +59,8 @@ public abstract class CompetitionEvent {
     @LastModifiedDate
     @Column(name = "updated_at")
     private Instant updatedAt;
+
+    @Version
+    @Column(name = "version", nullable = false)
+    private Long version;
 }

src/main/java/com/itasocialacademy/oitassist/competition/dao/repository/CompetitionRepository.java

@@ -2,13 +2,28 @@
 
 import com.itasocialacademy.oitassist.competition.dao.enums.CompetitionStatus;
 import com.itasocialacademy.oitassist.competition.dao.model.Competition;
+import jakarta.persistence.LockModeType;
+import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CompetitionRepository extends JpaRepository<Competition, Long>, JpaSpecificationExecutor<Competition> {
     Page<Competition> findAllByCompetitionStatus(CompetitionStatus status, Pageable pageable);
+
+    /**
+     * Fetches a Competition with a pessimistic write lock (SELECT ... FOR UPDATE),
+     * used as the entry point for any structural hierarchy mutation or status
+     * transition, to serialize concurrent changes on the same competition and close
+     * the write-skew window between publish/finish and delete of a Stage/Tour.
+     */
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT c from Competition c where c.id = :id")
+    Optional<Competition> findByIdForUpdate(@Param("id") Long id);
 }

src/main/java/com/itasocialacademy/oitassist/competition/dto/request/ChangeCompetitionStatusRequest.java

@@ -2,6 +2,7 @@
 
 import com.itasocialacademy.oitassist.competition.dao.enums.CompetitionStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
 import jakarta.validation.constraints.NotNull;
 
 @Schema(description = "DTO for changing the lifecycle status of a Competition")
@@ -10,5 +11,8 @@ public record ChangeCompetitionStatusRequest(
         description = "The target status to transition the competition into (e.g., PUBLISHED, FINISHED, ARCHIVED)",
         example = "PUBLISHED",
         requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(
-            message = "New status cannot be null") CompetitionStatus status) {
+            message = "New status cannot be null") CompetitionStatus status,
+
+    @Schema(description = "Optimistic locking version; must be echoed back on updates",
+        requiredMode = RequiredMode.REQUIRED) @NotNull Long version) {
 }