Add API endpoints for weapon issuance and requests

src/main/java/com/crimeLink/analyzer/config/SecurityConfig.java

@@ -76,7 +76,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 
                         // OIC-only routes
                         .requestMatchers("/api/duty-schedules/**").hasRole("OIC")
-                        .requestMatchers("/api/weapon/**").hasRole("OIC")
+                        .requestMatchers("/api/weapon/**").permitAll()
                         .requestMatchers("/api/weapon-issue/**").hasRole("OIC")
 
                         // Admin/OIC routes (officer data, locations, users)

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

@@ -0,0 +1,5 @@
+package com.crimeLink.analyzer.controller;
+
+public @interface ReqquiredArgsConstructor {
+
+}

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

@@ -69,7 +69,7 @@ public ResponseEntity<?> getAllWeaponsWithDetails() {
             List<WeaponResponseDTO> weapons = weaponService.getAllWeaponsWithDetails();
             return ResponseEntity.ok(weapons);
         } catch (Exception e) {
-            e.printStackTrace();  // Log the full stack trace
+            e.printStackTrace(); // Log the full stack trace
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                     .body(createErrorResponse("Failed to fetch weapons with details: " + e.getMessage()));
         }
@@ -89,6 +89,11 @@ public ResponseEntity<?> getWeaponBySerial(@PathVariable String serialNumber) {
         }
     }
 
+    @GetMapping("/officer/{officerId}")
+    public List<Weapon> getWeaponsIssuedToOfficer(@PathVariable Integer officerId) {
+        return weaponService.getWeaponsIssuedToOfficer(officerId);
+    }
+
     private Map<String, String> createErrorResponse(String message) {
         Map<String, String> response = new HashMap<>();
         response.put("error", message);

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

@@ -4,6 +4,8 @@
 import com.crimeLink.analyzer.dto.OfficerDTO;
 import com.crimeLink.analyzer.dto.ReturnWeaponRequestDTO;
 import com.crimeLink.analyzer.dto.WeaponAddDTO;
+import com.crimeLink.analyzer.entity.WeaponIssue;
+import com.crimeLink.analyzer.repository.WeaponIssueRepository;
 import com.crimeLink.analyzer.service.WeaponIssueService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -21,6 +23,7 @@
 public class WeaponIssueController {
 
     private final WeaponIssueService weaponIssueService;
+    private final WeaponIssueRepository weaponIssueRepository;
 
     @PostMapping("/issue")
     public ResponseEntity<?> issueWeapon(@RequestBody IssueWeaponRequestDTO dto) {
@@ -83,6 +86,16 @@ public ResponseEntity<?> getAllOfficers() {
         }
     }
 
+    @GetMapping("/issued/{officerId}")
+    public List<WeaponIssue> getActiveWeapons(@PathVariable Integer officerId) {
+        return weaponIssueRepository.findByIssuedTo_UserIdAndReturnedAtIsNullOrderByIssuedAtDesc(officerId);
+    }
+
+    @GetMapping("/history/{officerId}")
+    public List<WeaponIssue> getWeaponIssueHistory(@PathVariable Integer officerId) {
+        return weaponIssueRepository.findByIssuedTo_UserIdOrderByIssuedAtDesc(officerId);
+    }
+
     private Map<String, String> createErrorResponse(String message) {
         Map<String, String> response = new HashMap<>();
         response.put("error", message);

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

@@ -0,0 +1,57 @@
+package com.crimeLink.analyzer.controller;
+
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.crimeLink.analyzer.dto.WeaponRequestDto;
+import com.crimeLink.analyzer.service.WeaponRequestService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/api/weapon/requests")
+@RequiredArgsConstructor
+public class WeaponRequestController {
+
+    private final WeaponRequestService weaponRequestService;
+
+    @PostMapping
+    public ResponseEntity<WeaponRequestDto> createRequest(@RequestBody WeaponRequestDto dto) {
+        WeaponRequestDto createRequest = weaponRequestService.createRequest(dto);
+        return ResponseEntity.ok(createRequest);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<WeaponRequestDto>> getAllRequests() {
+        List<WeaponRequestDto> requests = weaponRequestService.getAllRequests();
+        return ResponseEntity.ok(requests);
+    }
+
+    @GetMapping("user/{userId}")
+    public ResponseEntity<List<WeaponRequestDto>> getRequestsByUser(@PathVariable Integer userId) {
+        List<WeaponRequestDto> requests = weaponRequestService.getRequestsByUser(userId);
+        return ResponseEntity.ok(requests);
+    }
+
+    @PutMapping("/{requestId}/approve")
+    public ResponseEntity<WeaponRequestDto> approveRequest(@PathVariable Integer requestId) {
+        WeaponRequestDto approvedRequest = weaponRequestService.approvedRequest(requestId);
+
+        return ResponseEntity.ok(approvedRequest);
+    }
+
+    @PutMapping("/{requestId}/reject")
+    public ResponseEntity<WeaponRequestDto> rejectRequest(@PathVariable Integer requestId) {
+        WeaponRequestDto rejectedRequest = weaponRequestService.rejectedRequest(requestId);
+
+        return ResponseEntity.ok(rejectedRequest);
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.crimeLink.analyzer.dto;
+
+import java.time.LocalDateTime;
+
+import lombok.Data;
+
+@Data
+public class WeaponRequestDto {
+    private Integer requestId;
+    private String weaponSerial;
+    private Integer ammoCount;
+    private Integer requestedById;
+    private String requestNote;
+    private String status;
+    private LocalDateTime requestedAt;
+    private LocalDateTime resolvedAt;
+}

src/main/java/com/crimeLink/analyzer/entity/WeaponRequest.java

@@ -0,0 +1,47 @@
+package com.crimeLink.analyzer.entity;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Table(name = "weapon_requests")
+public class WeaponRequest {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer requestId;
+
+    /* Weapon */
+    @ManyToOne
+    @JoinColumn(name = "weapon_serial", referencedColumnName = "serial_number")
+    private Weapon weapon;
+
+    /* Issued to */
+    @ManyToOne
+    @JoinColumn(name = "requested_by", referencedColumnName = "user_id")
+    private User requestedBy;
+
+    private Integer ammoCount;
+
+    private LocalDateTime requestedAt;
+    private LocalDateTime resolvedAt;
+    private String requestNote;
+
+    @Enumerated(EnumType.STRING)
+    private WeaponRequestStatus status;
+}

src/main/java/com/crimeLink/analyzer/entity/WeaponRequestStatus.java

@@ -0,0 +1,7 @@
+package com.crimeLink.analyzer.entity;
+
+public enum WeaponRequestStatus {
+    PENDING,
+    APPROVED,
+    REJECTED
+}

src/main/java/com/crimeLink/analyzer/mapper/WeaponRequestMapper.java

@@ -0,0 +1,34 @@
+package com.crimeLink.analyzer.mapper;
+
+import com.crimeLink.analyzer.dto.WeaponRequestDto;
+import com.crimeLink.analyzer.entity.User;
+import com.crimeLink.analyzer.entity.Weapon;
+import com.crimeLink.analyzer.entity.WeaponRequest;
+
+public class WeaponRequestMapper {
+    public static WeaponRequestDto mapToWeaponRequestDto(WeaponRequest entity) {
+
+        WeaponRequestDto dto = new WeaponRequestDto();
+
+        dto.setRequestId(entity.getRequestId());
+        dto.setWeaponSerial(entity.getWeapon().getSerialNumber());
+        dto.setAmmoCount(entity.getAmmoCount());
+        dto.setRequestedById(entity.getRequestedBy().getUserId());
+        dto.setRequestNote(entity.getRequestNote());
+        dto.setStatus(entity.getStatus().name());
+        dto.setRequestedAt(entity.getRequestedAt());
+        dto.setResolvedAt(entity.getResolvedAt());
+        return dto;
+    }
+
+    public static WeaponRequest mapToWeaponRequest(WeaponRequestDto dto, Weapon weapon, User user) {
+
+        WeaponRequest entity = new WeaponRequest();
+
+        entity.setWeapon(weapon);
+        entity.setRequestedBy(user);
+        entity.setRequestNote(dto.getRequestNote());
+        entity.setAmmoCount(dto.getAmmoCount());
+        return entity;
+    }
+}

src/main/java/com/crimeLink/analyzer/repository/WeaponIssueRepository.java

@@ -10,5 +10,11 @@
 @Repository
 public interface WeaponIssueRepository extends JpaRepository<WeaponIssue, Integer> {
     List<WeaponIssue> findByWeapon_SerialNumberAndReturnedAtIsNullOrderByIssuedAtDesc(String serialNumber);
+
     Optional<WeaponIssue> findByWeapon_SerialNumberAndReturnedAtIsNull(String serialNumber);
+
+    List<WeaponIssue> findByIssuedTo_UserIdOrderByIssuedAtDesc(Integer officerId);
+
+    List<WeaponIssue> findByIssuedTo_UserIdAndReturnedAtIsNullOrderByIssuedAtDesc(Integer officerId);
+
 }

src/main/java/com/crimeLink/analyzer/repository/WeaponRepository.java

@@ -3,6 +3,8 @@
 import com.crimeLink.analyzer.entity.Weapon;
 import com.crimeLink.analyzer.enums.WeaponStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,6 +13,16 @@
 @Repository
 public interface WeaponRepository extends JpaRepository<Weapon, String> {
     boolean existsById(String serialNumber);
+
     List<Weapon> findByStatus(WeaponStatus status);
+
     Optional<Weapon> findBySerialNumber(String serialNumber);
+
+    @Query("""
+        SELECT wi.weapon
+        FROM WeaponIssue wi
+        WHERE wi.issuedTo.userId = :userId
+        AND wi.returnedAt IS NULL
+    """)
+    List<Weapon> findActiveWeaponsByOfficer(@Param("officerId") Integer officerId);
 }

src/main/java/com/crimeLink/analyzer/repository/WeaponRequestRepository.java

@@ -0,0 +1,16 @@
+package com.crimeLink.analyzer.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.crimeLink.analyzer.entity.WeaponRequest;
+
+@Repository
+public interface WeaponRequestRepository extends JpaRepository<WeaponRequest, Integer> {
+
+    List<WeaponRequest> findByRequestedBy_UserId(Integer userId);
+
+    List<WeaponRequest> findByStatus(String status);
+}

src/main/java/com/crimeLink/analyzer/service/WeaponRequestService.java

@@ -0,0 +1,17 @@
+package com.crimeLink.analyzer.service;
+
+import java.util.List;
+
+import com.crimeLink.analyzer.dto.WeaponRequestDto;
+
+public interface WeaponRequestService {
+    WeaponRequestDto createRequest(WeaponRequestDto requestDto);
+
+    List<WeaponRequestDto> getAllRequests();
+
+    List<WeaponRequestDto> getRequestsByUser(Integer userId);
+
+    WeaponRequestDto approvedRequest(Integer requestId);
+
+    WeaponRequestDto rejectedRequest(Integer requestId);
+}

src/main/java/com/crimeLink/analyzer/service/WeaponService.java

@@ -13,4 +13,5 @@ public interface WeaponService {
     List<Weapon> getAllWeapons();
     Weapon getWeaponBySerial(String serialNumber);
     List<WeaponResponseDTO> getAllWeaponsWithDetails();
+    List<Weapon> getWeaponsIssuedToOfficer(Integer officerId);
 }