Merge pull request #451 from magento-performance/CABPI-395

CABPI-395: Fix Failed Magento Health Index Tests

Author: slopukhov

app/code/Magento/AdminAdobeIms/Api/Data/ImsWebapiInterface.php

@@ -131,7 +131,7 @@ public function setAccessTokenExpiresAt(string $value): ImsWebapiInterface;
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
-     * @return \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface
+     * @return \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface|null
      */
     public function getExtensionAttributes(): ImsWebapiExtensionInterface;
 
@@ -141,7 +141,5 @@ public function getExtensionAttributes(): ImsWebapiExtensionInterface;
      * @param \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(
-        ImsWebapiExtensionInterface $extensionAttributes
-    ): ImsWebapiInterface;
+    public function setExtensionAttributes(ImsWebapiExtensionInterface $extensionAttributes): ImsWebapiInterface;
 }

app/code/Magento/AdminAdobeIms/Service/AbstractAdminBaseProcessService.php

@@ -30,14 +30,14 @@ abstract class AbstractAdminBaseProcessService
     protected Auth $auth;
 
     /**
-     * @var LogOut
+     * @var DateTime
      */
-    protected LogOut $logOut;
+    protected DateTime $dateTime;
 
     /**
-     * @var DateTime
+     * @var LogOut
      */
-    protected DateTime $dateTime;
+    private LogOut $logOut;
 
     /**
      * @param User $adminUser

app/code/Magento/AdminAdobeIms/etc/db_schema.xml

@@ -15,8 +15,8 @@
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Updated At"/>
         <column xsi:type="timestamp" name="last_check_time" on_update="false" nullable="false" default="0" comment="Last check time"/>
         <column xsi:type="timestamp" name="access_token_expires_at" on_update="false" nullable="false" default="0" comment="Access Token Expires At"/>
-        <index referenceId="ADMIN_ADOBE_IMS_WEBAPI_ID" indexType="btree">
-            <column name="id"/>
+        <index referenceId="ADMIN_ADOBE_IMS_WEBAPI_ADMIN_USER_ID" indexType="btree">
+            <column name="admin_user_id"/>
         </index>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>

app/code/Magento/AdminAdobeIms/etc/db_schema_whitelist.json

@@ -11,12 +11,12 @@
             "access_token_expires_at": true
         },
         "index": {
-            "ADMIN_ADOBE_IMS_WEBAPI_ID": true
+            "ADMIN_ADOBE_IMS_WEBAPI_ADMIN_USER_ID": true
         },
         "constraint": {
             "PRIMARY": true,
             "ADMIN_ADOBE_IMS_WEBAPI_ACCESS_TOKEN_HASH": true,
             "ADMIN_ADOBE_IMS_WEBAPI_ADMIN_USER_ID_ADMIN_USER_USER_ID": true
         }
     }
-}
+}

app/code/Magento/AdobeIms/etc/db_schema.xml

@@ -18,8 +18,8 @@
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Updated At"/>
         <column xsi:type="timestamp" name="access_token_expires_at" on_update="false" nullable="false" default="0" comment="Access Token Expires At"/>
-        <index referenceId="ADOBE_USER_PROFILE_ID" indexType="btree">
-            <column name="id"/>
+        <index referenceId="ADOBE_USER_PROFILE_ADMIN_USER_ID" indexType="btree">
+            <column name="admin_user_id"/>
         </index>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>

app/code/Magento/AdobeIms/etc/db_schema_whitelist.json

@@ -13,7 +13,7 @@
       "updated_at": true
     },
     "index": {
-      "ADOBE_USER_PROFILE_ID": true
+      "ADOBE_USER_PROFILE_ADMIN_USER_ID": true
     },
     "constraint": {
       "PRIMARY": true,