Skip to content

Commit 23f3cbe

Browse files
authored
Renames scopes xml queries to avoid conflict with other modules queries. (#233)
* obfuscating customerGroupCode as sha1(customerGroupId) * Updating Test for accomodating to sha1 calculation over customerGroupId * renaming queries stores and storeViews to scopesStoreGroup and scopesStoreView to avoid conflicts with other modules' queries. Updating di.xml and et_schema.xml accordingly
1 parent 2f4dfd3 commit 23f3cbe

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

ScopesDataExporter/etc/di.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,20 @@
117117
</argument>
118118
</arguments>
119119
</type>
120+
121+
<virtualType
122+
name="Magento\ScopesDataExporter\Model\Provider\ScopesStoreGroupProvider"
123+
type="Magento\DataExporter\Model\Provider\QueryDataProvider">
124+
<arguments>
125+
<argument name="queryName" xsi:type="string">scopesStoreGroup</argument>
126+
</arguments>
127+
</virtualType>
128+
129+
<virtualType
130+
name="Magento\ScopesDataExporter\Model\Provider\ScopesStoreViewProvider"
131+
type="Magento\DataExporter\Model\Provider\QueryDataProvider">
132+
<arguments>
133+
<argument name="queryName" xsi:type="string">scopesStoreView</argument>
134+
</arguments>
135+
</virtualType>
120136
</config>

ScopesDataExporter/etc/et_schema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<field name="stores"
3131
type="StoreGroup"
3232
repeated="true"
33-
provider="Magento\DataExporter\Model\Provider\QueryDataProvider">
33+
provider="Magento\ScopesDataExporter\Model\Provider\ScopesStoreGroupProvider">
3434
<using field="websiteId"/>
3535
</field>
3636
</record>
@@ -41,7 +41,7 @@
4141
<field name="storeViews"
4242
type="StoreView"
4343
repeated="true"
44-
provider="Magento\DataExporter\Model\Provider\QueryDataProvider">
44+
provider="Magento\ScopesDataExporter\Model\Provider\ScopesStoreViewProvider">
4545
<using field="storeId"/>
4646
</field>
4747
</record>

ScopesDataExporter/etc/query.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</source>
2121
</query>
2222

23-
<query name="stores">
23+
<query name="scopesStoreGroup">
2424
<source name="store_group">
2525
<attribute name="group_id" alias="storeId" />
2626
<attribute name="website_id" alias="websiteId" />
@@ -31,7 +31,7 @@
3131
</source>
3232
</query>
3333

34-
<query name="storeViews">
34+
<query name="scopesStoreView">
3535
<source name="store">
3636
<attribute name="group_id" alias="storeId" />
3737
<attribute name="store_id" alias="storeViewId" />

0 commit comments

Comments
 (0)