From 6844234d96b166260dd06e52236dba23f1c12f37 Mon Sep 17 00:00:00 2001
From: Arun Kumar Madesh <56151567+arunkumar461@users.noreply.github.com>
Date: Mon, 10 Mar 2025 09:40:34 +0000
Subject: [PATCH] CCMSPUI-666 | Add ACTIVE_FLAG column

---
 .../main/java/uk/gov/laa/ccms/data/entity/MatterType.java | 8 ++++++++
 .../java/uk/gov/laa/ccms/data/service/LookupService.java  | 1 +
 .../uk/gov/laa/ccms/data/service/LookupServiceTest.java   | 1 +
 3 files changed, 10 insertions(+)

diff --git a/data-service/src/main/java/uk/gov/laa/ccms/data/entity/MatterType.java b/data-service/src/main/java/uk/gov/laa/ccms/data/entity/MatterType.java
index 3d99d38a..7c34d8f2 100644
--- a/data-service/src/main/java/uk/gov/laa/ccms/data/entity/MatterType.java
+++ b/data-service/src/main/java/uk/gov/laa/ccms/data/entity/MatterType.java
@@ -40,4 +40,12 @@ public class MatterType {
    */
   @Column(name = "CATEGORY_OF_LAW_CODE")
   private String categoryOfLawCode;
+
+  /**
+   * The category of law code.
+   */
+  @Column(name = "ACTIVE_FLAG")
+  private String activeFlag;
+
+
 }
diff --git a/data-service/src/main/java/uk/gov/laa/ccms/data/service/LookupService.java b/data-service/src/main/java/uk/gov/laa/ccms/data/service/LookupService.java
index f120d02b..13d62b6c 100644
--- a/data-service/src/main/java/uk/gov/laa/ccms/data/service/LookupService.java
+++ b/data-service/src/main/java/uk/gov/laa/ccms/data/service/LookupService.java
@@ -220,6 +220,7 @@ public MatterTypeLookupDetail getMatterTypeLookupValues(
     example.setMatterType(matterType);
     example.setDescription(description);
     example.setCategoryOfLawCode(categoryOfLaw);
+    example.setActiveFlag("Y");
 
     return lookupMapper.toMatterTypeLookupDetail(
         matterTypeRepository.findAll(Example.of(example), pageable));
diff --git a/data-service/src/test/java/uk/gov/laa/ccms/data/service/LookupServiceTest.java b/data-service/src/test/java/uk/gov/laa/ccms/data/service/LookupServiceTest.java
index f7672e59..eb275953 100644
--- a/data-service/src/test/java/uk/gov/laa/ccms/data/service/LookupServiceTest.java
+++ b/data-service/src/test/java/uk/gov/laa/ccms/data/service/LookupServiceTest.java
@@ -504,6 +504,7 @@ void getMatterTypeLookupValues_returnsPageOfMatterTypeValues() {
         matterTypeEntity.setDescription(description);
         matterTypeEntity.setMatterType(matterType);
         matterTypeEntity.setCategoryOfLawCode(categoryOfLaw);
+        matterTypeEntity.setActiveFlag("Y");
 
         Page<MatterType> expectedPage = new PageImpl<>(
             Collections.singletonList(matterTypeEntity));