Added Announcement enpoints, services and controllers

Author: iSiRaH

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

@@ -51,9 +51,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         .requestMatchers("/api/auth/**").permitAll()
                         .requestMatchers("/api/health").permitAll()
                         .requestMatchers("/api/admin/health").permitAll()
-                        .requestMatchers("/api/facial/health").permitAll()  // ML service health check
-                        .requestMatchers("/api/call-analysis/health").permitAll()  // ML service health check
-                        
+                        .requestMatchers("/api/facial/health").permitAll() // ML service health check
+                        .requestMatchers("/api/call-analysis/health").permitAll() // ML service health check
+
                         // ML Service endpoints
                         .requestMatchers("/api/call-analysis/**").hasRole("Investigator")
                         .requestMatchers("/api/facial/register").hasAnyRole("Investigator", "OIC")
@@ -63,7 +63,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                         // Criminal CRUD (direct DB, no Python)
                         .requestMatchers("/api/criminals/**").hasAnyRole("Investigator", "OIC")
                         .requestMatchers("/api/criminals").hasAnyRole("Investigator", "OIC")
-                        
+
                         .requestMatchers("/api/database/**").permitAll()
                         .requestMatchers("/api/test").permitAll()
                         .requestMatchers("/api/debug/**").permitAll() // 🔍 Debug endpoints
@@ -90,9 +90,14 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 
                         // Admin/OIC/Investigator routes (officer data, locations, users)
                         .requestMatchers("/api/users/field-officers").hasAnyRole("Admin", "OIC", "Investigator")
-                        .requestMatchers("/api/admin/officers/*/locations/**").hasAnyRole("Admin", "OIC", "Investigator")
+                        .requestMatchers("/api/admin/officers/*/locations/**")
+                        .hasAnyRole("Admin", "OIC", "Investigator")
                         .requestMatchers("/api/admin/**").hasAnyRole("OIC", "Admin")
 
+                        // Officer announcements
+                        .requestMatchers("/api/announcements").hasAnyRole("OIC", "FieldOfficer")
+                        .requestMatchers("/api/announcements/**").hasRole("OIC")
+
                         .anyRequest().authenticated())
                 .exceptionHandling(exception -> exception
                         .authenticationEntryPoint(new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED))
@@ -107,7 +112,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class);
 
         return http.build();
-        }
+    }
 
     @Bean
     public AuthenticationProvider authenticationProvider() {
@@ -136,8 +141,7 @@ public CorsConfigurationSource corsConfigurationSource() {
             configuration.setAllowedOriginPatterns(List.of("*"));
         } else {
             configuration.setAllowedOrigins(
-                Arrays.asList(corsAllowedOrigins.split(","))
-            );
+                    Arrays.asList(corsAllowedOrigins.split(",")));
         }
         configuration.setAllowedMethods(Arrays.asList(
                 "GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"));

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

@@ -0,0 +1,75 @@
+package com.crimeLink.analyzer.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+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.entity.OfficerAnnouncement;
+import com.crimeLink.analyzer.enums.AnnouncementStatus;
+import com.crimeLink.analyzer.service.OfficerAnnouncementService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping("/api/announcements")
+@RequiredArgsConstructor
+public class OfficerAnnouncementController {
+    private final OfficerAnnouncementService announcementService;
+
+    @PostMapping
+    public ResponseEntity<OfficerAnnouncement> createAnnouncement(
+            @RequestBody OfficerAnnouncement announcement) {
+        OfficerAnnouncement created = announcementService.createAnnouncement(announcement);
+        return ResponseEntity.status(HttpStatus.CREATED).body(created);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<OfficerAnnouncement>> getAllAnnouncements() {
+        return ResponseEntity.ok(announcementService.getAllAnnouncements());
+    }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<OfficerAnnouncement> getAnnouncementById(@PathVariable Long id) {
+        return ResponseEntity.ok(announcementService.getAnnouncementById(id));
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<OfficerAnnouncement> updateAnnouncement(
+            @PathVariable Long id,
+            @RequestBody OfficerAnnouncement updatedData) {
+        return ResponseEntity.ok(announcementService.updateAnnouncement(id, updatedData));
+    }
+
+    @PatchMapping("/{id}/status")
+    public ResponseEntity<OfficerAnnouncement> changeStatus(
+            @PathVariable Long id,
+            @RequestBody Map<String, String> body) {
+        String statusValue = body.get("status");
+        if (statusValue == null || statusValue.isBlank()) {
+            return ResponseEntity.badRequest().build();
+        }
+        try {
+            AnnouncementStatus newStatus = AnnouncementStatus.valueOf(statusValue.toUpperCase());
+            return ResponseEntity.ok(announcementService.changeStatus(id, newStatus));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest().build();
+        }
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteAnnouncement(@PathVariable Long id) {
+        announcementService.deleteAnnouncement(id);
+        return ResponseEntity.noContent().build();
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.crimeLink.analyzer.dto;
+
+import java.util.Date;
+
+import com.crimeLink.analyzer.enums.AnnouncementStatus;
+import com.crimeLink.analyzer.enums.AnnouncementTags;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OfficerAnnouncementDTO {
+    private Long id;
+    private String title;
+    private String message;
+    private Date date;
+    private AnnouncementTags tag;
+    private AnnouncementStatus status;
+}

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

@@ -0,0 +1,50 @@
+package com.crimeLink.analyzer.entity;
+
+import java.util.Date;
+
+import com.crimeLink.analyzer.enums.AnnouncementStatus;
+import com.crimeLink.analyzer.enums.AnnouncementTags;
+
+import jakarta.persistence.Column;
+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.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Data
+@Table(name = "officer_announcement")
+@AllArgsConstructor
+@NoArgsConstructor
+public class OfficerAnnouncement {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String title;
+
+    @Column(nullable = false, columnDefinition = "TEXT")
+    private String message;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(nullable = false, updatable = false)
+    private Date date;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private AnnouncementTags tag;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private AnnouncementStatus status;
+}

src/main/java/com/crimeLink/analyzer/enums/AnnouncementStatus.java

@@ -0,0 +1,5 @@
+package com.crimeLink.analyzer.enums;
+
+public enum AnnouncementStatus {
+    ACTIVE, INACTIVE, ARCHIVED
+}

src/main/java/com/crimeLink/analyzer/enums/AnnouncementTags.java

@@ -0,0 +1,5 @@
+package com.crimeLink.analyzer.enums;
+
+public enum AnnouncementTags {
+    GENERAL, ALERT, UPDATE, EVENT
+}

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

@@ -0,0 +1,34 @@
+package com.crimeLink.analyzer.mapper;
+
+import com.crimeLink.analyzer.dto.OfficerAnnouncementDTO;
+import com.crimeLink.analyzer.entity.OfficerAnnouncement;
+
+public class OfficerAnnouncementMapper {
+    public static OfficerAnnouncementDTO mapToDTO(OfficerAnnouncement entity) {
+        if (entity == null) {
+            return null;
+        }
+        OfficerAnnouncementDTO dto = new OfficerAnnouncementDTO();
+        dto.setId(entity.getId());
+        dto.setTitle(entity.getTitle());
+        dto.setMessage(entity.getMessage());
+        dto.setDate(entity.getDate());
+        dto.setTag(entity.getTag());
+        dto.setStatus(entity.getStatus());
+        return dto;
+    }
+
+    public static OfficerAnnouncement mapToEntity(OfficerAnnouncementDTO dto) {
+        if (dto == null) {
+            return null;
+        }
+        OfficerAnnouncement entity = new OfficerAnnouncement();
+        entity.setId(dto.getId());
+        entity.setTitle(dto.getTitle());
+        entity.setMessage(dto.getMessage());
+        entity.setDate(dto.getDate());
+        entity.setTag(dto.getTag());
+        entity.setStatus(dto.getStatus());
+        return entity;
+    }
+}

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

@@ -0,0 +1,17 @@
+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.OfficerAnnouncement;
+import com.crimeLink.analyzer.enums.AnnouncementStatus;
+import com.crimeLink.analyzer.enums.AnnouncementTags;
+
+@Repository
+public interface OfficerAnnouncementRepository extends JpaRepository<OfficerAnnouncement, Long> {
+    List<OfficerAnnouncement> findByStatus(AnnouncementStatus status);
+
+    List<OfficerAnnouncement> findByTag(AnnouncementTags tag);
+}

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

@@ -0,0 +1,20 @@
+package com.crimeLink.analyzer.service;
+
+import java.util.List;
+
+import com.crimeLink.analyzer.entity.OfficerAnnouncement;
+import com.crimeLink.analyzer.enums.AnnouncementStatus;
+
+public interface OfficerAnnouncementService {
+    public OfficerAnnouncement createAnnouncement(OfficerAnnouncement announcement);
+
+    public List<OfficerAnnouncement> getAllAnnouncements();
+
+    public OfficerAnnouncement getAnnouncementById(Long id);
+
+    public OfficerAnnouncement updateAnnouncement(Long id, OfficerAnnouncement announcement);
+
+    public OfficerAnnouncement changeStatus(Long id, AnnouncementStatus status);
+
+    public void deleteAnnouncement(Long id);
+}

src/main/java/com/crimeLink/analyzer/service/impl/OfficerAnnouncementServiceImpl.java

@@ -0,0 +1,59 @@
+package com.crimeLink.analyzer.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.crimeLink.analyzer.entity.OfficerAnnouncement;
+import com.crimeLink.analyzer.enums.AnnouncementStatus;
+import com.crimeLink.analyzer.repository.OfficerAnnouncementRepository;
+import com.crimeLink.analyzer.service.OfficerAnnouncementService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class OfficerAnnouncementServiceImpl implements OfficerAnnouncementService {
+
+    private final OfficerAnnouncementRepository announcementRepository;
+
+    public OfficerAnnouncement createAnnouncement(OfficerAnnouncement announcement) {
+        announcement.setId(null);
+        announcement.setDate(new Date());
+        if (announcement.getStatus() == null) {
+            announcement.setStatus(AnnouncementStatus.ACTIVE);
+        }
+        return announcementRepository.save(announcement);
+    }
+
+    public List<OfficerAnnouncement> getAllAnnouncements() {
+        return announcementRepository.findAll();
+    }
+
+    public OfficerAnnouncement getAnnouncementById(Long id) {
+        return announcementRepository.findById(id).orElseThrow(() -> new RuntimeException("Announcement not found"));
+    }
+
+    public OfficerAnnouncement updateAnnouncement(Long id, OfficerAnnouncement announcement) {
+        OfficerAnnouncement existing = getAnnouncementById(id);
+        existing.setTitle(announcement.getTitle());
+        existing.setMessage(announcement.getMessage());
+        existing.setTag(announcement.getTag());
+        existing.setStatus(announcement.getStatus());
+        return announcementRepository.save(existing);
+    }
+
+    public OfficerAnnouncement changeStatus(Long id, AnnouncementStatus status) {
+        OfficerAnnouncement existing = getAnnouncementById(id);
+        existing.setStatus(status);
+        return announcementRepository.save(existing);
+    }
+
+    public void deleteAnnouncement(Long id) {
+        if(!announcementRepository.existsById(id)) {
+            throw new RuntimeException("Announcement not found");
+        }
+        announcementRepository.deleteById(id);
+    }
+}