From 74cce6ec8d29a055145bea08d33777dee3ac6b7b Mon Sep 17 00:00:00 2001
From: Jon Friesen <frij@amazon.com>
Date: Thu, 27 Mar 2025 19:44:56 +0000
Subject: [PATCH] delete obsolete objects when pulling in the bgd

---
 .../zcl_abapgit_background_pull.clas.abap     |  9 +++++-
 .../zcl_abapgit_services_repo.clas.abap       | 30 +++++++++----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/background/zcl_abapgit_background_pull.clas.abap b/src/background/zcl_abapgit_background_pull.clas.abap
index 414e248e6..cd5c4585f 100644
--- a/src/background/zcl_abapgit_background_pull.clas.abap
+++ b/src/background/zcl_abapgit_background_pull.clas.abap
@@ -11,7 +11,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_background_pull IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_BACKGROUND_PULL IMPLEMENTATION.
 
 
   METHOD zif_abapgit_background~get_description.
@@ -46,6 +46,13 @@ CLASS zcl_abapgit_background_pull IMPLEMENTATION.
 
     lo_settings->set_activate_wo_popup( abap_true ).
 
+
+    " pass decisions to delete
+    zcl_abapgit_services_repo=>delete_unnecessary_objects(
+      io_repo   = io_repo
+      is_checks = ls_checks
+      ii_log    = ii_log ).
+
     io_repo->deserialize( is_checks = ls_checks
                           ii_log    = ii_log ).
 
diff --git a/src/ui/routing/zcl_abapgit_services_repo.clas.abap b/src/ui/routing/zcl_abapgit_services_repo.clas.abap
index 64b8e73f7..7fdd8215b 100644
--- a/src/ui/routing/zcl_abapgit_services_repo.clas.abap
+++ b/src/ui/routing/zcl_abapgit_services_repo.clas.abap
@@ -69,23 +69,14 @@ CLASS zcl_abapgit_services_repo DEFINITION
       RETURNING
         VALUE(ri_log) TYPE REF TO zif_abapgit_log
       RAISING
-        zcx_abapgit_exception.
+        zcx_abapgit_exception .
     CLASS-METHODS create_package
       IMPORTING
         !iv_prefill_package TYPE devclass OPTIONAL
       RETURNING
         VALUE(rv_package)   TYPE devclass
       RAISING
-        zcx_abapgit_exception.
-  PROTECTED SECTION.
-  PRIVATE SECTION.
-    CLASS-METHODS check_package_exists
-      IMPORTING
-        !iv_package TYPE devclass
-        !it_remote  TYPE zif_abapgit_git_definitions=>ty_files_tt
-      RAISING
-        zcx_abapgit_exception.
-
+        zcx_abapgit_exception .
     CLASS-METHODS delete_unnecessary_objects
       IMPORTING
         !io_repo   TYPE REF TO zcl_abapgit_repo
@@ -93,6 +84,15 @@ CLASS zcl_abapgit_services_repo DEFINITION
         !is_checks TYPE zif_abapgit_definitions=>ty_deserialize_checks
       RAISING
         zcx_abapgit_exception .
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+
+    CLASS-METHODS check_package_exists
+      IMPORTING
+        !iv_package TYPE devclass
+        !it_remote  TYPE zif_abapgit_git_definitions=>ty_files_tt
+      RAISING
+        zcx_abapgit_exception .
     CLASS-METHODS popup_decisions
       IMPORTING
         !io_repo   TYPE REF TO zcl_abapgit_repo
@@ -118,17 +118,17 @@ CLASS zcl_abapgit_services_repo DEFINITION
         zcx_abapgit_exception .
     CLASS-METHODS raise_error_if_package_exists
       IMPORTING
-        iv_devclass TYPE devclass
+        !iv_devclass TYPE devclass
       RAISING
-        zcx_abapgit_exception.
+        zcx_abapgit_exception .
     CLASS-METHODS check_for_restart
       IMPORTING
-        !io_repo TYPE REF TO zif_abapgit_repo.
+        !io_repo TYPE REF TO zif_abapgit_repo .
 ENDCLASS.
 
 
 
-CLASS zcl_abapgit_services_repo IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION.
 
 
   METHOD activate_objects.