Merge pull request #34 from arosha-w/Dev

Implement bullet management with controller, service, and DTOs

Author: arosha-w

src/main/java/com/crimeLink/analyzer/controller/BulletController.java

@@ -0,0 +1,97 @@
+package com.crimeLink.analyzer.controller;
+
+import com.crimeLink.analyzer.dto.BulletAddDTO;
+import com.crimeLink.analyzer.dto.BulletResponseDTO;
+import com.crimeLink.analyzer.dto.BulletUpdateDTO;
+import com.crimeLink.analyzer.entity.Bullet;
+import com.crimeLink.analyzer.service.BulletService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/bullet")
+@RequiredArgsConstructor
+@CrossOrigin(origins = "*")
+public class BulletController {
+
+    private final BulletService bulletService;
+
+    @PostMapping("/add-bullet")
+    public ResponseEntity<?> addBullet(@RequestBody BulletAddDTO dto) {
+        try {
+            Bullet bullet = bulletService.addBullet(dto);
+            return ResponseEntity.status(HttpStatus.CREATED).body(bullet);
+        } catch (RuntimeException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(createErrorResponse(e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(createErrorResponse("An unexpected error occurred"));
+        }
+    }
+
+    @PutMapping("/bullet-update/{bulletId}")
+    public ResponseEntity<?> updateBullet(
+            @PathVariable Integer bulletId,
+            @RequestBody BulletUpdateDTO dto) {
+        try {
+            Bullet bullet = bulletService.updateBullet(bulletId, dto);
+            return ResponseEntity.ok(bullet);
+        } catch (RuntimeException e) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(createErrorResponse(e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(createErrorResponse("An unexpected error occurred"));
+        }
+    }
+
+    @GetMapping("/all")
+    public ResponseEntity<?> getAllBullets() {
+        try {
+            List<Bullet> bullets = bulletService.getAllBullets();
+            return ResponseEntity.ok(bullets);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(createErrorResponse("Failed to fetch bullets"));
+        }
+    }
+
+    @GetMapping("/all-with-details")
+    public ResponseEntity<?> getAllBulletsWithDetails() {
+        try {
+            List<BulletResponseDTO> bullets = bulletService.getAllBulletsWithDetails();
+            return ResponseEntity.ok(bullets);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(createErrorResponse("Failed to fetch bullets with details: " + e.getMessage()));
+        }
+    }
+
+    @GetMapping("/{bulletId}")
+    public ResponseEntity<?> getBulletById(@PathVariable Integer bulletId) {
+        try {
+            Bullet bullet = bulletService.getBulletById(bulletId);
+            return ResponseEntity.ok(bullet);
+        } catch (RuntimeException e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                    .body(createErrorResponse(e.getMessage()));
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(createErrorResponse("Failed to fetch bullet"));
+        }
+    }
+
+    private Map<String, String> createErrorResponse(String message) {
+        Map<String, String> response = new HashMap<>();
+        response.put("error", message);
+        return response;
+    }
+}

src/main/java/com/crimeLink/analyzer/controller/UserController.java

@@ -1,10 +1,7 @@
 package com.crimeLink.analyzer.controller;
 
-
 import com.crimeLink.analyzer.entity.User;
 import com.crimeLink.analyzer.service.UserService;
-import com.crimeLink.analyzer.service.WeaponIssueService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -19,11 +16,13 @@ public UserController(UserService service) {
         this.service = service;
     }
 
-    @GetMapping("/field-officers")
     public List<User> getFieldOfficers() {
         return service.getFieldOfficers();
     }
 
+    @GetMapping("/all-officers")
+    public List<User> getAllOfficers() {
+        return service.getAllOfficers();
+    }
 
 }
-

src/main/java/com/crimeLink/analyzer/dto/BulletAddDTO.java

@@ -0,0 +1,10 @@
+package com.crimeLink.analyzer.dto;
+
+import lombok.Data;
+
+@Data
+public class BulletAddDTO {
+    private String bulletType;
+    private Integer numberOfMagazines;
+    private String remarks;
+}

src/main/java/com/crimeLink/analyzer/dto/BulletResponseDTO.java

@@ -0,0 +1,16 @@
+package com.crimeLink.analyzer.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BulletResponseDTO {
+    private Integer bulletId;
+    private String bulletType;
+    private Integer numberOfMagazines;
+    private String remarks;
+    private String registerDate;
+}

src/main/java/com/crimeLink/analyzer/dto/BulletUpdateDTO.java

@@ -0,0 +1,10 @@
+package com.crimeLink.analyzer.dto;
+
+import lombok.Data;
+
+@Data
+public class BulletUpdateDTO {
+    private String bulletType;
+    private Integer numberOfMagazines;
+    private String remarks;
+}

src/main/java/com/crimeLink/analyzer/dto/IssueWeaponRequestDTO.java

@@ -10,4 +10,9 @@ public class IssueWeaponRequestDTO {
     private Integer handedOverById;
     private LocalDate dueDate;
     private String issueNote;
+
+       // Bullet details (optional - can issue weapon without bullets)
+    private String bulletType;
+    private Integer numberOfMagazines;
+    private String bulletRemarks;
 }

src/main/java/com/crimeLink/analyzer/dto/ReturnWeaponRequestDTO.java

@@ -7,4 +7,10 @@ public class ReturnWeaponRequestDTO {
     private String weaponSerial;
     private Integer receivedByUserId;
     private String returnNote;
+
+       // Bullet return details (optional)
+    private Integer returnedMagazines;
+    private Integer usedBullets;
+    private String bulletCondition;
+    private String bulletRemarks;
 }

src/main/java/com/crimeLink/analyzer/dto/WeaponResponseDTO.java

@@ -19,4 +19,8 @@ public class WeaponResponseDTO {
     private String issuedDate;
     private String dueDate;
     private String issueNote;
+
+     // Bullet details (if issued with bullets)
+    private String issuedBulletType;
+    private Integer issuedMagazines;
 }

src/main/java/com/crimeLink/analyzer/dto/WeaponReturnResponseDTO.java

@@ -0,0 +1,47 @@
+package com.crimeLink.analyzer.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "bullets")
+@Data
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Bullet {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "bullet_id")
+    private Integer bulletId;
+
+    @Column(name = "bullet_type", nullable = false)
+    private String bulletType;
+
+    @Column(name = "number_of_magazines", nullable = false)
+    private Integer numberOfMagazines;
+
+    @Column(name = "register_date", updatable = false)
+    private LocalDateTime registerDate;
+
+    @Column(name = "updated_date")
+    private LocalDateTime updatedDate;
+
+    @Column(name = "remarks")
+    private String remarks;
+
+    @PrePersist
+    void onCreate() {
+        registerDate = LocalDateTime.now();
+        updatedDate = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    void onUpdate() {
+        updatedDate = LocalDateTime.now();
+    }
+}