IOBJ/ODSO: Fix errors if objects exist already (#5551)

Implementation worked only for new objects (argh)

Co-authored-by: Lars Hvam <larshp@hotmail.com>

src/objects/zcl_abapgit_object_iobj.clas.abap

@@ -58,11 +58,17 @@ CLASS zcl_abapgit_object_iobj IMPLEMENTATION.
         i_iobjnm         = lv_objna
         i_objvers        = 'A'
       IMPORTING
-        e_s_viobj = <lg_viobj>.
+        e_s_viobj        = <lg_viobj>
-
+      EXCEPTIONS
+        iobj_not_found   = 1
+        illegal_input    = 2
+        bct_comp_invalid = 3
+        not_authorized   = 4
+        OTHERS           = 5.
+    IF sy-subrc = 0.
       ASSIGN COMPONENT 'TSTPNM' OF STRUCTURE <lg_viobj> TO <lg_tstpnm>.
-
       rv_user = <lg_tstpnm>.
+    ENDIF.
 
   ENDMETHOD.
 
@@ -208,6 +214,13 @@ CLASS zcl_abapgit_object_iobj IMPLEMENTATION.
 
     TRY.
 
+        ASSIGN
+          COMPONENT 'INFOOBJECT'
+          OF STRUCTURE <lg_details>
+          TO <lg_infoobject>.
+        ASSERT sy-subrc = 0.
+
+        IF zif_abapgit_object~exists( ) = abap_false.
           CALL FUNCTION 'BAPI_IOBJ_CREATE'
             EXPORTING
               details                  = <lg_details>
@@ -222,17 +235,28 @@ CLASS zcl_abapgit_object_iobj IMPLEMENTATION.
               elimination              = <lt_elimination>
               hanafieldsmapping        = <lt_hanafieldsmapping>
               xxlattributes            = <lt_xxlattributes>.
+        ELSE.
+          CALL FUNCTION 'BAPI_IOBJ_CHANGE'
+            EXPORTING
+              infoobject               = <lg_infoobject>
+              details                  = <lg_details>
+            IMPORTING
+              return                   = ls_return
+            TABLES
+              compounds                = <lt_compounds>
+              attributes               = <lt_attributes>
+              navigationattributes     = <lt_navigationattributes>
+              atrnavinfoprovider       = <lt_atrnavinfoprovider>
+              hierarchycharacteristics = <lt_hierarchycharacteristics>
+              elimination              = <lt_elimination>
+              hanafieldsmapping        = <lt_hanafieldsmapping>
+              xxlattributes            = <lt_xxlattributes>.
+        ENDIF.
 
         IF ls_return-type = 'E'.
           zcx_abapgit_exception=>raise( |Error when creating iobj: { ls_return-message }| ).
         ENDIF.
 
-        ASSIGN
-          COMPONENT 'INFOOBJECT'
-          OF STRUCTURE <lg_details>
-          TO <lg_infoobject>.
-        ASSERT sy-subrc = 0.
-
         APPEND <lg_infoobject> TO <lt_infoobjects>.
 
         CALL FUNCTION 'BAPI_IOBJ_ACTIVATE_MULTIPLE'

src/objects/zcl_abapgit_object_odso.clas.abap

@@ -133,6 +133,7 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION.
 
     FIELD-SYMBOLS:
       <lg_details>     TYPE any,
+      <lg_odsobject>   TYPE any,
       <lt_infoobjects> TYPE STANDARD TABLE,
       <lt_navigation>  TYPE STANDARD TABLE,
       <lt_indexes>     TYPE STANDARD TABLE,
@@ -169,6 +170,11 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION.
     io_xml->read( EXPORTING iv_name = 'INDEX_IOBJ'
                   CHANGING  cg_data =  <lt_index_iobj> ).
     TRY.
+
+        ASSIGN COMPONENT 'ODSOBJECT' OF STRUCTURE <lg_details> TO <lg_odsobject>.
+        ASSERT sy-subrc = 0.
+
+        IF zif_abapgit_object~exists( ) = abap_false.
           CALL FUNCTION 'BAPI_ODSO_CREATE'
             EXPORTING
               details              = <lg_details>
@@ -180,6 +186,18 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION.
               indexes              = <lt_indexes>
               indexesinfoobjects   = <lt_index_iobj>
               return               = lt_return.
+        ELSE.
+          CALL FUNCTION 'BAPI_ODSO_CHANGE'
+            EXPORTING
+              odsobject            = <lg_odsobject>
+              details              = <lg_details>
+            TABLES
+              infoobjects          = <lt_infoobjects>
+              navigationattributes = <lt_navigation>
+              indexes              = <lt_indexes>
+              indexesinfoobjects   = <lt_index_iobj>
+              return               = lt_return.
+        ENDIF.
 
       CATCH  cx_sy_dyn_call_illegal_func.
         zcx_abapgit_exception=>raise( |Necessary BW function modules not found or object not supported| ).
@@ -192,7 +210,7 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION.
 
     CALL FUNCTION 'BAPI_ODSO_ACTIVATE'
       EXPORTING
-        odsobject = lv_dsonam
+        odsobject = <lg_odsobject>
       TABLES
         return    = lt_return.