From 0be78203d50e513bfaab4c3cd536b6ff63eb34f0 Mon Sep 17 00:00:00 2001
From: Marc Bernard <59966492+mbtools@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:39:33 -0400
Subject: [PATCH] SOTR: Fix handling of alias names (#5750)

---
 .../texts/zcl_abapgit_sotr_handler.clas.abap  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap b/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap
index 7e2044f34..0e2012ebd 100644
--- a/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap
+++ b/src/objects/texts/zcl_abapgit_sotr_handler.clas.abap
@@ -88,6 +88,7 @@ CLASS zcl_abapgit_sotr_handler IMPLEMENTATION.
     DATA:
       lt_objects TYPE sotr_objects,
       ls_paket   TYPE sotr_pack,
+      lv_alias   TYPE sotr_head-alias_name,
       lv_object  LIKE LINE OF lt_objects.
 
     FIELD-SYMBOLS: <ls_sotr> LIKE LINE OF it_sotr.
@@ -110,11 +111,17 @@ CLASS zcl_abapgit_sotr_handler IMPLEMENTATION.
 
       ls_paket-paket = iv_package.
 
+      " Replace package in alias with new package
+      lv_alias = <ls_sotr>-header-alias_name.
+      IF lv_alias CS '/'.
+        lv_alias = iv_package && lv_alias+sy-fdpos(*).
+      ENDIF.
+
       CALL FUNCTION 'SOTR_CREATE_CONCEPT'
         EXPORTING
           paket                         = ls_paket
           crea_lan                      = <ls_sotr>-header-crea_lan
-          alias_name                    = <ls_sotr>-header-alias_name
+          alias_name                    = lv_alias
           object                        = lv_object
           entries                       = <ls_sotr>-entries
           concept_default               = <ls_sotr>-header-concept
@@ -255,6 +262,7 @@ CLASS zcl_abapgit_sotr_handler IMPLEMENTATION.
   METHOD get_sotr_4_concept.
 
     DATA: ls_header  TYPE zif_abapgit_definitions=>ty_sotr-header,
+          lv_paket   LIKE ls_header-alias_name,
           lt_entries TYPE zif_abapgit_definitions=>ty_sotr-entries.
 
     FIELD-SYMBOLS: <ls_entry> LIKE LINE OF lt_entries.
@@ -273,6 +281,16 @@ CLASS zcl_abapgit_sotr_handler IMPLEMENTATION.
       RETURN.
     ENDIF.
 
+    " If alias contains package, remove it
+    lv_paket = ls_header-paket && '/'.
+    IF ls_header-alias_name CS lv_paket.
+      ls_header-alias_name = replace(
+        val  = ls_header-alias_name
+        sub  = lv_paket
+        with = '/'
+        occ  = 1 ).
+    ENDIF.
+
     CLEAR: ls_header-paket,
            ls_header-crea_name,
            ls_header-crea_tstut,