Modjams

.github/workflows/ci-cd.yml

@@ -1,4 +1,4 @@
-name: Modtale CI/CD 
+name: Modtale CI/CD
 
 on:
   push:
@@ -51,7 +51,7 @@ jobs:
           fi
           echo "GIT_BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
           echo "BRANCH_SLUG=$BRANCH_SLUG" >> $GITHUB_ENV
-          
+
           if [ "$BRANCH_NAME" = "main" ]; then
             echo "ENV_TYPE=prod" >> $GITHUB_ENV
             echo "BUILD_SERVICE_ACCOUNT=${{ vars.GCP_BUILD_SERVICE_ACCOUNT }}" >> $GITHUB_ENV
@@ -76,7 +76,7 @@ jobs:
             echo "WARDEN_ENABLED=true" >> $GITHUB_ENV
             echo "OAUTH_ENABLED=true" >> $GITHUB_ENV
             echo "WARDEN_SECRET_NAME=WARDEN_API_KEY" >> $GITHUB_ENV
-          
+
           elif [ "$BRANCH_NAME" = "develop" ]; then
             echo "ENV_TYPE=dev" >> $GITHUB_ENV
             echo "BUILD_SERVICE_ACCOUNT=${{ vars.GCP_BUILD_SERVICE_ACCOUNT }}" >> $GITHUB_ENV
@@ -101,7 +101,7 @@ jobs:
             echo "WARDEN_ENABLED=true" >> $GITHUB_ENV
             echo "OAUTH_ENABLED=true" >> $GITHUB_ENV
             echo "WARDEN_SECRET_NAME=WARDEN_API_KEY" >> $GITHUB_ENV
-          
+
           else
             SLUG="$BRANCH_SLUG"
             BRANCH_PREVIEW_SOURCE_R2_BUCKET_NAME="${{ vars.GCP_BRANCH_PREVIEW_SOURCE_R2_BUCKET_NAME }}"
@@ -417,7 +417,7 @@ jobs:
             --config=cloudbuild.yml \
             --service-account="projects/$PROJECT_ID/serviceAccounts/$BUILD_SERVICE_ACCOUNT" \
             --substitutions=_TAG=${{ env.TAG }} .
-          
+
           ARGS=(
             "--image" "gcr.io/$PROJECT_ID/modtale-backend:${{ env.TAG }}"
             "--region" "$REGION"
@@ -602,7 +602,7 @@ jobs:
           else
             PUBLIC_BACKEND_URL=$B_URL
           fi
-          
+
           gcloud run services update ${{ env.BACKEND_SERVICE }} \
             --region $REGION \
             --update-env-vars "FRONTEND_URL=$FINAL_FRONTEND_URL,BACKEND_URL=$PUBLIC_BACKEND_URL"
@@ -674,21 +674,21 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "| Component | Status | Target Service | Service URL |" >> $GITHUB_STEP_SUMMARY
           echo "|---|---|---|---|" >> $GITHUB_STEP_SUMMARY
-          
+
           if [ -n "$PUBLIC_API_URL" ]; then
             echo "| **Backend API** | $BACKEND_STATUS | \`${{ env.BACKEND_SERVICE }}\` | [API Endpoint]($PUBLIC_API_URL) |" >> $GITHUB_STEP_SUMMARY
           elif [ -n "$B_URL" ]; then
             echo "| **Backend API** | $BACKEND_STATUS | \`${{ env.BACKEND_SERVICE }}\` | [API Endpoint]($B_URL/api/v1) |" >> $GITHUB_STEP_SUMMARY
           else
             echo "| **Backend API** | $BACKEND_STATUS | \`${{ env.BACKEND_SERVICE }}\` | *N/A* |" >> $GITHUB_STEP_SUMMARY
           fi
-          
+
           if [ -n "$F_URL" ]; then
             echo "| **Frontend App** | $FRONTEND_STATUS | \`${{ env.FRONTEND_SERVICE }}\` | [App URL]($F_URL) |" >> $GITHUB_STEP_SUMMARY
           else
             echo "| **Frontend App** | $FRONTEND_STATUS | \`${{ env.FRONTEND_SERVICE }}\` | *N/A* |" >> $GITHUB_STEP_SUMMARY
           fi
-          
+
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "---" >> $GITHUB_STEP_SUMMARY
           echo "*View deployment details in [Google Cloud Console](https://console.cloud.google.com/run?project=${{ env.PROJECT_ID }}).* " >> $GITHUB_STEP_SUMMARY

backend/src/main/java/net/modtale/ModtaleApplication.java

@@ -8,6 +8,7 @@
 
 @SpringBootApplication
 @ConfigurationPropertiesScan
+@EnableCaching
 @EnableMethodSecurity
 public class ModtaleApplication {
     public static void main(String[] args) {

backend/src/main/java/net/modtale/config/security/SecurityConfig.java

@@ -289,7 +289,10 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         .requestMatchers("/sitemap.xml", "/actuator/health", "/actuator/health/**").permitAll()
                         .requestMatchers("/client-metadata.json").permitAll()
                         .requestMatchers(HttpMethod.GET,
+                                "/api/v1/projects",
                                 "/api/v1/projects/**",
+                                "/api/v1/modjams",
+                                "/api/v1/modjams/**",
                                 "/api/v1/tags",
                                 "/api/v1/files/**",
                                 "/api/v1/user/profile/**",
@@ -361,9 +364,10 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 "/api/v1/auth/change-password",
                                 "/api/v1/auth/credentials"
                         ).authenticated()
-                        .requestMatchers(HttpMethod.POST, "/api/v1/projects/**").authenticated()
-                        .requestMatchers(HttpMethod.PUT, "/api/v1/projects/**").authenticated()
-                        .requestMatchers(HttpMethod.DELETE, "/api/v1/projects/**").authenticated()
+                        .requestMatchers(HttpMethod.POST, "/api/v1/projects", "/api/v1/projects/**", "/api/v1/modjams", "/api/v1/modjams/**").authenticated()
+                        .requestMatchers(HttpMethod.PUT, "/api/v1/projects", "/api/v1/projects/**", "/api/v1/modjams", "/api/v1/modjams/**").authenticated()
+                        .requestMatchers(HttpMethod.DELETE, "/api/v1/projects", "/api/v1/projects/**", "/api/v1/modjams", "/api/v1/modjams/**").authenticated()
+                        .requestMatchers(HttpMethod.PATCH, "/api/v1/modjams", "/api/v1/modjams/**").authenticated()
                         .requestMatchers("/api/**").authenticated()
                         .anyRequest().permitAll()
                 )

backend/src/main/java/net/modtale/controller/ModjamController.java

@@ -0,0 +1,166 @@
+package net.modtale.controller;
+
+import net.modtale.model.jam.Modjam;
+import net.modtale.model.jam.ModjamSubmission;
+import net.modtale.model.user.User;
+import net.modtale.service.ModjamService;
+import net.modtale.service.user.account.AccountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/v1/modjams")
+public class ModjamController {
+
+    @Autowired private ModjamService modjamService;
+    @Autowired private AccountService accountService;
+
+    @GetMapping
+    public ResponseEntity<List<Modjam>> getAllJams() {
+        return ResponseEntity.ok(modjamService.getAllJams());
+    }
+
+    @GetMapping("/user/me")
+    public ResponseEntity<List<Modjam>> getMyJams() {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.getUserHostedJams(user.getId()));
+    }
+
+    @GetMapping("/{slug}")
+    public ResponseEntity<Modjam> getJamBySlug(@PathVariable String slug) {
+        return ResponseEntity.ok(modjamService.getJamBySlug(slug));
+    }
+
+    @PostMapping
+    public ResponseEntity<Modjam> createJam(@RequestBody Modjam jam) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.createJam(jam, user.getId(), user.getUsername()));
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<Modjam> updateJam(@PathVariable String id, @RequestBody Modjam jam) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.updateJam(id, jam));
+    }
+
+    @PutMapping("/{id}/icon")
+    public ResponseEntity<?> updateIcon(@PathVariable String id, @RequestParam("file") MultipartFile file) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        try {
+            modjamService.updateIcon(id, file);
+            return ResponseEntity.ok().build();
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @PutMapping("/{id}/banner")
+    public ResponseEntity<?> updateBanner(@PathVariable String id, @RequestParam("file") MultipartFile file) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        try {
+            modjamService.updateBanner(id, file);
+            return ResponseEntity.ok().build();
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<?> deleteJam(@PathVariable String id) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        try {
+            modjamService.deleteJam(id, user.getId());
+            return ResponseEntity.ok().build();
+        } catch (ResponseStatusException e) {
+            return ResponseEntity.status(e.getStatusCode()).body(e.getReason());
+        } catch (Exception e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
+
+    @GetMapping("/{jamId}/submissions")
+    public ResponseEntity<List<ModjamSubmission>> getSubmissions(@PathVariable String jamId) {
+        return ResponseEntity.ok(modjamService.getSubmissions(jamId));
+    }
+
+    @PostMapping("/{jamId}/participate")
+    public ResponseEntity<Modjam> participate(@PathVariable String jamId) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.participate(jamId, user.getId()));
+    }
+
+    @PostMapping("/{jamId}/leave")
+    public ResponseEntity<Modjam> leaveJam(@PathVariable String jamId) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.leaveJam(jamId, user.getId()));
+    }
+
+    @PostMapping("/{jamId}/submit")
+    public ResponseEntity<ModjamSubmission> submitProject(@PathVariable String jamId, @RequestBody Map<String, String> body) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.submitProject(jamId, body.get("projectId"), user.getId()));
+    }
+
+    @PostMapping("/{jamId}/vote")
+    public ResponseEntity<ModjamSubmission> vote(@PathVariable String jamId, @RequestBody Map<String, Object> body) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+
+        String submissionId = (String) body.get("submissionId");
+        String categoryId = (String) body.get("categoryId");
+        int score = (Integer) body.get("score");
+
+        return ResponseEntity.ok(modjamService.vote(jamId, submissionId, categoryId, score, user.getId()));
+    }
+
+    @PostMapping("/{jamId}/finalize")
+    public ResponseEntity<Modjam> finalizeJam(@PathVariable String jamId, @RequestBody List<Map<String, String>> winners) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.finalizeJam(jamId, user.getId(), winners));
+    }
+
+    // Judging Endpoints
+    @PostMapping("/{jamId}/judges/invite")
+    public ResponseEntity<Modjam> inviteJudge(@PathVariable String jamId, @RequestBody Map<String, String> body) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.inviteJudge(jamId, body.get("username"), user.getId()));
+    }
+
+    @PostMapping("/{jamId}/judges/accept")
+    public ResponseEntity<Modjam> acceptJudge(@PathVariable String jamId) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.acceptJudgeInvite(jamId, user.getId(), user.getUsername()));
+    }
+
+    @PostMapping("/{jamId}/judges/decline")
+    public ResponseEntity<Modjam> declineJudge(@PathVariable String jamId) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.declineJudgeInvite(jamId, user.getUsername()));
+    }
+
+    @DeleteMapping("/{jamId}/judges/{username}")
+    public ResponseEntity<Modjam> removeJudge(@PathVariable String jamId, @PathVariable String username) {
+        User user = accountService.getCurrentUser();
+        if (user == null) return ResponseEntity.status(401).build();
+        return ResponseEntity.ok(modjamService.removeJudge(jamId, username, user.getId()));
+    }
+}

backend/src/main/java/net/modtale/model/dto/project/ProjectDTO.java

@@ -36,6 +36,7 @@ public class ProjectDTO {
     private List<String> types;
     private List<String> childProjectIds;
     private List<String> modIds;
+    private List<String> modjamIds;
     private boolean allowModpacks;
     private boolean allowComments;
     private boolean hmWikiEnabled;
@@ -109,6 +110,8 @@ public class ProjectDTO {
     public void setChildProjectIds(List<String> childProjectIds) { this.childProjectIds = childProjectIds; }
     public List<String> getModIds() { return modIds; }
     public void setModIds(List<String> modIds) { this.modIds = modIds; }
+    public List<String> getModjamIds() { return modjamIds; }
+    public void setModjamIds(List<String> modjamIds) { this.modjamIds = modjamIds; }
     public boolean isAllowModpacks() { return allowModpacks; }
     public void setAllowModpacks(boolean allowModpacks) { this.allowModpacks = allowModpacks; }
     public boolean isAllowComments() { return allowComments; }