Skip to content

Commit 87b74b1

Browse files
authored
Merge pull request #451 from magento-performance/CABPI-395
CABPI-395: Fix Failed Magento Health Index Tests
2 parents 69fc881 + 163a714 commit 87b74b1

File tree

6 files changed

+13
-15
lines changed

6 files changed

+13
-15
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function setAccessTokenExpiresAt(string $value): ImsWebapiInterface;
131131
/**
132132
* Retrieve existing extension attributes object or create a new one.
133133
*
134-
* @return \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface
134+
* @return \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface|null
135135
*/
136136
public function getExtensionAttributes(): ImsWebapiExtensionInterface;
137137

@@ -141,7 +141,5 @@ public function getExtensionAttributes(): ImsWebapiExtensionInterface;
141141
* @param \Magento\AdminAdobeIms\Api\Data\ImsWebapiExtensionInterface $extensionAttributes
142142
* @return $this
143143
*/
144-
public function setExtensionAttributes(
145-
ImsWebapiExtensionInterface $extensionAttributes
146-
): ImsWebapiInterface;
144+
public function setExtensionAttributes(ImsWebapiExtensionInterface $extensionAttributes): ImsWebapiInterface;
147145
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ abstract class AbstractAdminBaseProcessService
3030
protected Auth $auth;
3131

3232
/**
33-
* @var LogOut
33+
* @var DateTime
3434
*/
35-
protected LogOut $logOut;
35+
protected DateTime $dateTime;
3636

3737
/**
38-
* @var DateTime
38+
* @var LogOut
3939
*/
40-
protected DateTime $dateTime;
40+
private LogOut $logOut;
4141

4242
/**
4343
* @param User $adminUser

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Updated At"/>
1616
<column xsi:type="timestamp" name="last_check_time" on_update="false" nullable="false" default="0" comment="Last check time"/>
1717
<column xsi:type="timestamp" name="access_token_expires_at" on_update="false" nullable="false" default="0" comment="Access Token Expires At"/>
18-
<index referenceId="ADMIN_ADOBE_IMS_WEBAPI_ID" indexType="btree">
19-
<column name="id"/>
18+
<index referenceId="ADMIN_ADOBE_IMS_WEBAPI_ADMIN_USER_ID" indexType="btree">
19+
<column name="admin_user_id"/>
2020
</index>
2121
<constraint xsi:type="primary" referenceId="PRIMARY">
2222
<column name="id"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"access_token_expires_at": true
1212
},
1313
"index": {
14-
"ADMIN_ADOBE_IMS_WEBAPI_ID": true
14+
"ADMIN_ADOBE_IMS_WEBAPI_ADMIN_USER_ID": true
1515
},
1616
"constraint": {
1717
"PRIMARY": true,
1818
"ADMIN_ADOBE_IMS_WEBAPI_ACCESS_TOKEN_HASH": true,
1919
"ADMIN_ADOBE_IMS_WEBAPI_ADMIN_USER_ID_ADMIN_USER_USER_ID": true
2020
}
2121
}
22-
}
22+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
1919
<column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP" comment="Updated At"/>
2020
<column xsi:type="timestamp" name="access_token_expires_at" on_update="false" nullable="false" default="0" comment="Access Token Expires At"/>
21-
<index referenceId="ADOBE_USER_PROFILE_ID" indexType="btree">
22-
<column name="id"/>
21+
<index referenceId="ADOBE_USER_PROFILE_ADMIN_USER_ID" indexType="btree">
22+
<column name="admin_user_id"/>
2323
</index>
2424
<constraint xsi:type="primary" referenceId="PRIMARY">
2525
<column name="id"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"updated_at": true
1414
},
1515
"index": {
16-
"ADOBE_USER_PROFILE_ID": true
16+
"ADOBE_USER_PROFILE_ADMIN_USER_ID": true
1717
},
1818
"constraint": {
1919
"PRIMARY": true,

0 commit comments

Comments
 (0)