Merge pull request #25 from Jalen-Stephens/6-api-implement-imagecontroller-endpoints

6 api implement imagecontroller endpoints

Author: ikeschmack

citations.md

@@ -935,3 +935,119 @@ Assistance was used to design and implement comprehensive branch-coverage unit t
 > Portions of this commit or configuration were generated with assistance from OpenAI ChatGPT (GPT-5) on October 22, 2025. All AI-generated content was reviewed, verified, and finalized by the development team.
 
 ---
+
+### **Commit / Ticket Reference**
+
+* **Commit:** `api(#6): wire ImageController to ImageService and update metadata handling`
+* **Ticket:** `#6 — Implement ImageController endpoints`
+* **Date:** October 22, 2025
+* **Team Member:** Jalen Stephens
+
+---
+
+### **AI Tool Information**
+
+* **Tool Used:** OpenAI ChatGPT (GPT-5)
+* **Access Method:** ChatGPT Web (.edu academic access)
+* **Configuration:** Default model settings
+* **Cost:** $0 (no paid API calls)
+
+---
+
+### **Purpose of AI Assistance**
+
+The AI assisted in implementing the HTTP-facing controller layer by wiring `ImageController` to the existing `ImageService`, ensuring correct DTO mappings, handling ownership enforcement, and aligning update endpoints with the final DTO definitions. It also confirmed correct HTTP response shapes and status codes.
+
+---
+
+### **Prompts / Interaction Summary**
+
+* “let’s implement the ticket”
+* “here is image controller”
+* “here is my user service”
+* “we can redo the dtos”
+* Compile errors surfaced → AI realigned controller logic with actual DTO structure
+
+---
+
+### **Resulting Artifacts**
+
+* `src/main/java/dev/coms4156/project/metadetect/controller/ImageController.java` (updated)
+* Metadata update endpoint corrected to match `UpdateImageRequest` structure (note + labels only)
+* Exception → HTTP mapping added (404 / 403)
+
+---
+
+### **Verification**
+
+* Successful Maven compilation after DTO alignment
+* Manual inspection of controller flow against schema and service logic
+* Local run verified routing and method resolution
+
+---
+
+### **Attribution Statement**
+
+> Portions of this commit or configuration were generated with assistance from OpenAI ChatGPT (GPT-5) on October 22, 2025. All AI-generated content was reviewed, verified, and finalized by the development team.
+
+---
+
+### **Commit / Ticket Reference**
+
+* **Commit:** `api(#6): finalize ImageController + DTOs, add controller tests and move C2PA check to unit test`
+* **Ticket:** `#6 — Implement ImageController endpoints`
+* **Date:** October 22, 2025
+* **Team Member:** Jalen Stephens
+
+---
+
+### **AI Tool Information**
+
+* **Tool Used:** OpenAI ChatGPT (GPT-5)
+* **Access Method:** ChatGPT Web (.edu academic access)
+* **Configuration:** Default model settings
+* **Cost:** $0 (no paid API calls)
+
+---
+
+### **Purpose of AI Assistance**
+
+Helped implement the controller logic integrating with the `ImageService`, updated DTO structures to match Supabase schema, and wrote comprehensive MockMvc-based unit tests to achieve branch and error-path coverage.
+
+---
+
+### **Prompts / Interaction Summary**
+
+* “Redo this ticket because we are using Supabase”
+* “Let’s implement the ticket”
+* “Generate test cases”
+* “Fix test failures and remove integration test dependency on c2patool”
+* “One line commit description”
+
+---
+
+### **Resulting Artifacts**
+
+* Updated: `ImageController.java`
+* Updated: `Dtos.java`
+* Added: `ImageControllerTest.java` (MockMvc tests)
+* Added: `AnalyzeServiceTest.java` (unit test replacement for former IT)
+* Removed: `AnalyzeServiceIntegrationTests.java`
+* Updated documentation: `citations.md`
+
+---
+
+### **Verification**
+
+* Successfully built via `mvn clean test`
+* All controller endpoints verified with MockMvc tests
+* Branch/error-path coverage for forbidden and not-found scenarios
+* Ensured no external binary dependency required for CI
+
+---
+
+### **Attribution Statement**
+
+> Portions of this commit or configuration were generated with assistance from OpenAI ChatGPT (GPT-5) on October 22, 2025. All AI-generated content was reviewed, verified, and finalized by the development team.
+
+---

src/main/java/dev/coms4156/project/metadetect/controller/ImageController.java

@@ -1,10 +1,18 @@
 package dev.coms4156.project.metadetect.controller;
 
 import dev.coms4156.project.metadetect.dto.Dtos;
+import dev.coms4156.project.metadetect.model.Image;
 import dev.coms4156.project.metadetect.service.ImageService;
+import dev.coms4156.project.metadetect.service.UserService;
+import dev.coms4156.project.metadetect.service.errors.ForbiddenException;
+import dev.coms4156.project.metadetect.service.errors.NotFoundException;
 import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -14,41 +22,112 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * CRUD around user images (records, not binary).
+ * CRUD for image metadata (not binary files). Enforces ownership via ImageService.
  */
 @RestController
 @RequestMapping("/api/images")
 public class ImageController {
 
   private final ImageService imageService;
+  private final UserService userService;
 
-  public ImageController(ImageService imageService) {
+  public ImageController(ImageService imageService, UserService userService) {
     this.imageService = imageService;
+    this.userService = userService;
   }
 
+  /** GET /api/images?page=0&size=20 — list current user's images (simple paging). */
   @GetMapping
-  public ResponseEntity<List<Dtos.ImageDto>> list(@RequestParam(defaultValue = "0") int page,
-                                                  @RequestParam(defaultValue = "20") int size) {
-    // TODO: paginate by owner user
-    return ResponseEntity.ok(List.of());
+  public ResponseEntity<List<Dtos.ImageDto>> list(
+      @RequestParam(defaultValue = "0") int page,
+      @RequestParam(defaultValue = "20") int size) {
+
+    if (page < 0 || size <= 0) {
+      return ResponseEntity.badRequest().build();
+    }
+
+    UUID userId = userService.getCurrentUserIdOrThrow();
+    List<Image> all = imageService.listByOwner(userId);
+
+    int from = Math.min(page * size, all.size());
+    int to = Math.min(from + size, all.size());
+
+    List<Dtos.ImageDto> items = all.subList(from, to)
+        .stream()
+        .map(this::toDto)
+        .collect(Collectors.toList());
+
+    return ResponseEntity.ok(items);
   }
 
+  /** GET /api/images/{id} — fetch a single image (ownership enforced in service). */
   @GetMapping("/{id}")
   public ResponseEntity<Dtos.ImageDto> get(@PathVariable String id) {
-    // TODO: fetch by id + ownership
-    return ResponseEntity.ok(new Dtos.ImageDto(id, "original.jpg", "owner-uid", null));
+    UUID userId = userService.getCurrentUserIdOrThrow();
+    UUID imageId = UUID.fromString(id);
+
+    Image img = imageService.getById(userId, imageId);
+    return ResponseEntity.ok(toDto(img));
   }
 
+  /** PUT /api/images/{id} — update mutable fields. */
   @PutMapping("/{id}")
-  public ResponseEntity<Dtos.ImageDto> update(@PathVariable String id,
-                                              @RequestBody Dtos.UpdateImageRequest req) {
-    // TODO: update mutable fields (labels, note)
-    return ResponseEntity.ok(new Dtos.ImageDto(id, "original.jpg", "owner-uid", null));
+  public ResponseEntity<Dtos.ImageDto> update(
+      @PathVariable String id,
+      @RequestBody Dtos.UpdateImageRequest req) {
+
+    UUID userId = userService.getCurrentUserIdOrThrow();
+    UUID imageId = UUID.fromString(id);
+
+    // Convert List<String> -> String[] for the service layer
+    String[] labels = (req.labels() == null) ? null : req.labels().toArray(new String[0]);
+
+    Image updated = imageService.update(
+        userId,
+        imageId,
+        null,          // filename (not changed via this endpoint)
+        null,          // storagePath (not changed via this endpoint)
+        labels,        // labels
+        req.note()     // note
+    );
+
+    return ResponseEntity.ok(toDto(updated));
   }
 
+
+  /** DELETE /api/images/{id} — hard delete metadata record. */
   @DeleteMapping("/{id}")
   public ResponseEntity<Void> delete(@PathVariable String id) {
-    // TODO: soft/hard delete image + reports
+    UUID userId = userService.getCurrentUserIdOrThrow();
+    UUID imageId = UUID.fromString(id);
+
+    imageService.delete(userId, imageId);
     return ResponseEntity.noContent().build();
   }
+
+  // ---- Exception → HTTP mapping (controller-scoped) ----
+
+  @ExceptionHandler(NotFoundException.class)
+  public ResponseEntity<String> handleNotFound(NotFoundException ex) {
+    return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
+  }
+
+  @ExceptionHandler(ForbiddenException.class)
+  public ResponseEntity<String> handleForbidden(ForbiddenException ex) {
+    return ResponseEntity.status(HttpStatus.FORBIDDEN).body(ex.getMessage());
+  }
+
+  // ---- Mapping helper ----
+  // Matches Dtos.ImageDto(id, filename, ownerId, uploadedAt)
+  private Dtos.ImageDto toDto(Image img) {
+    return new Dtos.ImageDto(
+      img.getId().toString(),
+      img.getFilename(),
+      img.getUserId().toString(),
+      img.getUploadedAt(),
+      (img.getLabels() == null ? List.of() : List.of(img.getLabels())),
+      img.getNote()
+    );
+  }
+
 }

src/main/java/dev/coms4156/project/metadetect/dto/Dtos.java

@@ -71,8 +71,14 @@ public record CompareResponse(String imageIdA, String imageIdB, Double similarit
   /**
    * Simplified view of an image record.
    */
-  public record ImageDto(String id, String filename, String ownerUserId, Instant uploadedAt) {
-  }
+  public record ImageDto(
+      String id,
+      String filename,
+      String ownerUserId,
+      Instant uploadedAt,
+      List<String> labels,
+      String note
+  ) {}
 
   /**
    * Request body for updating image metadata (labels, note).