From 65d08de249fcfc82c53a6bff30ec1ce22a976be6 Mon Sep 17 00:00:00 2001
From: Marc Bernard <59966492+mbtools@users.noreply.github.com>
Date: Fri, 29 Nov 2024 07:13:19 -0500
Subject: [PATCH] SRVB: Clear fields and fix deserialize order (#7085)

Co-authored-by: Lars Hvam <larshp@hotmail.com>
---
 src/objects/core/zcl_abapgit_dependencies.clas.abap  | 10 +++++++++-
 .../core/zcl_abapgit_file_deserialize.clas.abap      |  6 ++++++
 src/objects/zcl_abapgit_object_srvb.clas.abap        | 12 ++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/objects/core/zcl_abapgit_dependencies.clas.abap b/src/objects/core/zcl_abapgit_dependencies.clas.abap
index eccdd37d1..2d76f2320 100644
--- a/src/objects/core/zcl_abapgit_dependencies.clas.abap
+++ b/src/objects/core/zcl_abapgit_dependencies.clas.abap
@@ -119,7 +119,7 @@ CLASS zcl_abapgit_dependencies IMPLEMENTATION.
           " AUTH after DCLS
           <ls_tadir>-korrnum = '715000'.
         WHEN 'SUSH'.
-          " SUSH after SUSC
+          " SUSH after SUSC and SRVB
           <ls_tadir>-korrnum = '712000'.
         WHEN 'SUSC'.
           " SUSC after SUSO
@@ -130,6 +130,14 @@ CLASS zcl_abapgit_dependencies IMPLEMENTATION.
         WHEN 'DCLS'.
           " AUTH and SUSO after DCLS
           <ls_tadir>-korrnum = '705000'.
+        WHEN 'G4BA' OR 'G4BS' OR 'IWMO' OR 'IWSV' OR 'IWVB'.
+          " after SRVB
+          <ls_tadir>-korrnum = '610000'.
+        WHEN 'SRVB'.
+          " after SRVD
+          <ls_tadir>-korrnum = '600500'.
+        WHEN 'SRVD'.
+          <ls_tadir>-korrnum = '600000'.
         WHEN 'IASP'.
           <ls_tadir>-korrnum = '552000'.
         WHEN 'IARP'.
diff --git a/src/objects/core/zcl_abapgit_file_deserialize.clas.abap b/src/objects/core/zcl_abapgit_file_deserialize.clas.abap
index 52dc4b90e..242d9686f 100644
--- a/src/objects/core/zcl_abapgit_file_deserialize.clas.abap
+++ b/src/objects/core/zcl_abapgit_file_deserialize.clas.abap
@@ -245,6 +245,12 @@ CLASS zcl_abapgit_file_deserialize IMPLEMENTATION.
         WHEN 'ENSC'.
           lt_requires = lt_items.
           DELETE lt_requires WHERE obj_type <> 'ENHS'.
+        WHEN 'IWMO' OR 'IWSV' OR 'IWVB' OR 'SUSH'.
+          lt_requires = lt_items.
+          DELETE lt_requires WHERE obj_type <> 'SRVB'.
+        WHEN 'SRVB'.
+          lt_requires = lt_items.
+          DELETE lt_requires WHERE obj_type <> 'SRVD'.
       ENDCASE.
 * TODO: END extract to object handler method
 
diff --git a/src/objects/zcl_abapgit_object_srvb.clas.abap b/src/objects/zcl_abapgit_object_srvb.clas.abap
index a76dbfa01..85c5ca8fe 100644
--- a/src/objects/zcl_abapgit_object_srvb.clas.abap
+++ b/src/objects/zcl_abapgit_object_srvb.clas.abap
@@ -129,6 +129,18 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION.
       CHANGING
         cs_service_binding = cs_service_binding ).
 
+    clear_field(
+      EXPORTING
+        iv_fieldname       = 'METADATA-RESPONSIBLE'
+      CHANGING
+        cs_service_binding = cs_service_binding ).
+
+    clear_field(
+      EXPORTING
+        iv_fieldname       = 'METADATA-MASTER_LANGUAGE'
+      CHANGING
+        cs_service_binding = cs_service_binding ).
+
   ENDMETHOD.