From e60736fc1b7e9646f78a0538733c1cecf0b0427c Mon Sep 17 00:00:00 2001
From: ChrisS1512 <87066931+ChrisS1512@users.noreply.github.com>
Date: Tue, 3 Dec 2024 10:41:25 +0000
Subject: [PATCH 1/2] PUB-2681 - Updated model for system admin update

---
 build.gradle                                                  | 2 +-
 .../reform/pip/model/system/admin/SystemAdminAction.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ede2ef3..d3637ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ publishing {
 }
 
 group = 'com.github.hmcts'
-version = '2.1.33'
+version = '2.1.34'
 
 java {
   toolchain {
diff --git a/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java b/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java
index 8835ef5..891216f 100644
--- a/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java
+++ b/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java
@@ -24,9 +24,9 @@
 public abstract class SystemAdminAction {
 
     /**
-     * The name of the requester for the action.
+     * The email of the requester for the action.
      */
-    protected String requesterName;
+    protected String requesterEmail;
 
     /**
      * Whether the action was successful.

From 041e9a470a1c5f86dcd741f62a76fddc49a1e36c Mon Sep 17 00:00:00 2001
From: ChrisS1512 <87066931+ChrisS1512@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:19:04 +0000
Subject: [PATCH 2/2] PUB-2681 - Added not null checks

---
 .../reform/pip/model/system/admin/SystemAdminAction.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java b/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java
index 891216f..aaf38a2 100644
--- a/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java
+++ b/src/main/java/uk/gov/hmcts/reform/pip/model/system/admin/SystemAdminAction.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -26,21 +27,25 @@ public abstract class SystemAdminAction {
     /**
      * The email of the requester for the action.
      */
+    @NotNull
     protected String requesterEmail;
 
     /**
      * Whether the action was successful.
      */
+    @NotNull
     protected ActionResult actionResult;
 
     /**
      * The type of change that has been requested.
      */
+    @NotNull
     protected ChangeType changeType;
 
     /**
      * The list of users to notify about the email.
      */
+    @NotNull
     protected List<String> emailList;
 
     /**