Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added: The SystemMessgaeType data and Service Job data for Discount promo Code Application (#978) #69

Merged
merged 5 commits into from
Mar 22, 2024
Merged

Added: The SystemMessgaeType data and Service Job data for Discount promo Code Application (#978) #69

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc1ae87
Added: The SystemMessgaeType data and Service Job data for Discount p…
yaminibhagat Mar 20, 2024
c2101c0
Implemented Bulk Query with Shopify GraphQL to retrieve Promo Codes f…
yaminibhagat Mar 21, 2024
d833e4e
Improved the System Messgae Type data (#978)
yaminibhagat Mar 22, 2024
3f882d7
Added: the paramterName in BulkOrderDiscountCodeApplQuery systemMessa…
yaminibhagat Mar 22, 2024
c982ede
Removed the sendPath from the SendBulkOrderDiscountCodeApplQueryResul…
yaminibhagat Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,44 @@ You could configure following default parameters and any additional parameters a
</moqui.service.job.ServiceJob>
```

#### Bulk Order Discount Code Application

```aidl
<!-- SystemMessageType record for bulk order discount code application query to Shopify -->
<moqui.service.message.SystemMessageType systemMessageTypeId="BulkOrderDiscountCodeApplQuery"
description="Bulk Order Discount Code Application Query System Message"
parentTypeId="ShopifyBulkQuery"
sendServiceName="co.hotwax.shopify.system.ShopifySystemMessageServices.send#BulkQuerySystemMessage"
sendPath="component://shopify-connector/template/graphQL/BulkOrderDiscountCodeApplQuery.ftl"
consumeServiceName="co.hotwax.shopify.system.ShopifySystemMessageServices.consume#BulkOperationResult"
receivePath="${contentRoot}/shopify/BulkOrderDiscountCodeAppl/BulkOperationResult-${systemMessageId}-${remoteMessageId}-${nowDate}.jsonl">
<parameters parameterName="" parameterValue="" systemMessageRemoteId=""/>
</moqui.service.message.SystemMessageType>

<moqui.service.message.SystemMessageType systemMessageTypeId="SendBulkOrderDiscountCodeApplQueryResult"
description="Send Bulk Order Discount Code Application Query Result"
parentTypeId="LocalFeedFile"
sendServiceName="co.hotwax.ofbiz.SystemMessageServices.send#SystemMessageFileSftp"
sendPath="/home/${sftpUsername}/hotwax/shopify/BulkOrderDiscountCodeApplQueryResult/">
</moqui.service.message.SystemMessageType>

<!-- Enumeration to create relation between BulkOrderDiscountCodeApplQuery and SendBulkOrderDiscountCodeApplQueryResult SystemMessageType(s) -->
<moqui.basic.Enumeration description="Send Bulk Order Discount Code Application Query Result" enumId="SendBulkOrderDiscountCodeApplQueryResult" enumTypeId="ShopifyMessageTypeEnum"/>
<moqui.basic.Enumeration description="Bulk Order Discount Code Application Query" enumId="BulkOrderDiscountCodeApplQuery" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="SendBulkOrderDiscountCodeApplQueryResult" relatedEnumTypeId="ShopifyMessageTypeEnum"/>

<!-- ServiceJob data for queuing bulk order discount code application query -->
<moqui.service.job.ServiceJob jobName="queue_BulkQuerySystemMessage_BulkOrderDiscountCodeApplQuery" description="Queue bulk order Discount Code Application query"
serviceName="co.hotwax.shopify.system.ShopifySystemMessageServices.queue#BulkQuerySystemMessage" cronExpression="0 0/15 * * * ?" paused="Y">
<parameters parameterName="systemMessageTypeId" parameterValue="BulkOrderDiscountCodeApplQuery"/>
<parameters parameterName="systemMessageRemoteId" parameterValue=""/>
<parameters parameterName="filterQuery" parameterValue=""/>
<parameters parameterName="fromDate" parameterValue=""/>
<parameters parameterName="thruDate" parameterValue=""/>
<parameters parameterName="fromDateLabel" parameterValue=""/>
<parameters parameterName="thruDateLabel" parameterValue=""/>
</moqui.service.job.ServiceJob>
```

### Bulk Order Items Query

```aidl
Expand Down
13 changes: 13 additions & 0 deletions data/ShopifyServiceJobData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,19 @@ under the License.
<parameters parameterName="thruDateLabel" parameterValue=""/>
</moqui.service.job.ServiceJob>


<!-- ServiceJob data for queuing bulk order discount code application query -->
<moqui.service.job.ServiceJob jobName="queue_BulkQuerySystemMessage_BulkOrderDiscountCodeApplQuery" description="Queue Bulk Order Discount Code Application query"
serviceName="co.hotwax.shopify.system.ShopifySystemMessageServices.queue#BulkQuerySystemMessage" cronExpression="0 0/15 * * * ?" paused="Y">
<parameters parameterName="systemMessageTypeId" parameterValue="BulkOrderDiscountCodeApplQuery"/>
<parameters parameterName="systemMessageRemoteId" parameterValue=""/>
<parameters parameterName="filterQuery" parameterValue=""/>
<parameters parameterName="fromDate" parameterValue=""/>
<parameters parameterName="thruDate" parameterValue=""/>
<parameters parameterName="fromDateLabel" parameterValue=""/>
<parameters parameterName="thruDateLabel" parameterValue=""/>
</moqui.service.job.ServiceJob>

<!-- ServiceJob data for polling OMS Synced Refunds Feed -->
<moqui.service.job.ServiceJob jobName="poll_SystemMessageFileSftp_OMSSyncedRefundsFeed" description="Poll OMS Synced Refunds Feed"
serviceName="co.hotwax.ofbiz.SystemMessageServices.poll#SystemMessageFileSftp" cronExpression="0 0 * * * ?" paused="Y">
Expand Down
21 changes: 21 additions & 0 deletions data/ShopifySetupSeedData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,25 @@ under the License.
<moqui.basic.Enumeration description="Generate Order Metafields Feed" enumId="GenerateOrderMetafieldsFeed" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="SendOrderMetafieldsFeed" relatedEnumTypeId="ShopifyMessageTypeEnum"/>
<moqui.basic.Enumeration description="Order Ids Feed" enumId="OrderIdsFeed" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="GenerateOrderMetafieldsFeed" relatedEnumTypeId="ShopifyMessageTypeEnum"/>

<!-- SystemMessageType record for bulk order discount code application query to Shopify -->
<moqui.service.message.SystemMessageType systemMessageTypeId="BulkOrderDiscountCodeApplQuery"
description="Bulk Order Discount Code Application Query System Message"
parentTypeId="ShopifyBulkQuery"
sendServiceName="co.hotwax.shopify.system.ShopifySystemMessageServices.send#BulkQuerySystemMessage"
sendPath="component://shopify-connector/template/graphQL/BulkOrderDiscountCodeApplQuery.ftl"
consumeServiceName="co.hotwax.shopify.system.ShopifySystemMessageServices.consume#BulkOperationResult"
receivePath="${contentRoot}/shopify/BulkOrderDiscountCodeAppl/BulkOperationResult-${systemMessageId}-${remoteMessageId}-${nowDate}.jsonl">
<parameters parameterName="" parameterValue="" systemMessageRemoteId=""/>
</moqui.service.message.SystemMessageType>

<moqui.service.message.SystemMessageType systemMessageTypeId="SendBulkOrderDiscountCodeApplQueryResult"
description="Send Bulk Order Discount Code Application Query Result"
parentTypeId="LocalFeedFile"
sendServiceName="co.hotwax.ofbiz.SystemMessageServices.send#SystemMessageFileSftp"
sendPath="/home/${sftpUsername}/hotwax/shopify/BulkOrderDiscountCodeApplQueryResult/">
</moqui.service.message.SystemMessageType>

<!-- Enumeration to create relation between BulkOrderDiscountCodeApplQuery and SendBulkOrderDiscountCodeApplQueryResult SystemMessageType(s) -->
<moqui.basic.Enumeration description="Send Bulk Order Discount Code Application Query Result" enumId="SendBulkOrderDiscountCodeApplQueryResult" enumTypeId="ShopifyMessageTypeEnum"/>
<moqui.basic.Enumeration description="Bulk Order Discount Code Application Query" enumId="BulkOrderDiscountCodeApplQuery" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="SendBulkOrderDiscountCodeApplQueryResult" relatedEnumTypeId="ShopifyMessageTypeEnum"/>
</entity-facade-xml>
38 changes: 38 additions & 0 deletions data/UpgradeData_Upcoming.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>

<entity-facade-xml type="ext-upgrade-upcoming">
<!-- SystemMessageType record for bulk order discount code application query to Shopify -->
<moqui.service.message.SystemMessageType systemMessageTypeId="BulkOrderDiscountCodeApplQuery"
description="Bulk Order Discount Code Application Query System Message"
parentTypeId="ShopifyBulkQuery"
sendServiceName="co.hotwax.shopify.system.ShopifySystemMessageServices.send#BulkQuerySystemMessage"
sendPath="component://shopify-connector/template/graphQL/BulkOrderDiscountCodeApplQuery.ftl"
consumeServiceName="co.hotwax.shopify.system.ShopifySystemMessageServices.consume#BulkOperationResult"
receivePath="${contentRoot}/shopify/BulkOrderDiscountCodeAppl/BulkOperationResult-${systemMessageId}-${remoteMessageId}-${nowDate}.jsonl">
<parameters parameterName="" parameterValue="" systemMessageRemoteId=""/>
</moqui.service.message.SystemMessageType>

<moqui.service.message.SystemMessageType systemMessageTypeId="SendBulkOrderDiscountCodeApplQueryResult"
description="Send Bulk Order Discount Code Application Query Result"
parentTypeId="LocalFeedFile"
sendServiceName="co.hotwax.ofbiz.SystemMessageServices.send#SystemMessageFileSftp"
sendPath="/home/${sftpUsername}/hotwax/shopify/BulkOrderDiscountCodeApplQueryResult/">
</moqui.service.message.SystemMessageType>

<!-- Enumeration to create relation between BulkOrderDiscountCodeApplQuery and SendBulkOrderDiscountCodeApplQueryResult SystemMessageType(s) -->
<moqui.basic.Enumeration description="Send Bulk Order Discount Code Application Query Result" enumId="SendBulkOrderDiscountCodeApplQueryResult" enumTypeId="ShopifyMessageTypeEnum"/>
<moqui.basic.Enumeration description="Bulk Order Discount Code Application Query" enumId="BulkOrderDiscountCodeApplQuery" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="SendBulkOrderDiscountCodeApplQueryResult" relatedEnumTypeId="ShopifyMessageTypeEnum"/>

<!-- ServiceJob data for queuing bulk order discount code application query -->
<moqui.service.job.ServiceJob jobName="queue_BulkQuerySystemMessage_BulkOrderDiscountCodeApplQuery" description="Queue bulk order Discount Code Application query"
serviceName="co.hotwax.shopify.system.ShopifySystemMessageServices.queue#BulkQuerySystemMessage" cronExpression="0 0/15 * * * ?" paused="Y">
<parameters parameterName="systemMessageTypeId" parameterValue="BulkOrderDiscountCodeApplQuery"/>
<parameters parameterName="systemMessageRemoteId" parameterValue=""/>
<parameters parameterName="filterQuery" parameterValue=""/>
<parameters parameterName="fromDate" parameterValue=""/>
<parameters parameterName="thruDate" parameterValue=""/>
<parameters parameterName="fromDateLabel" parameterValue=""/>
<parameters parameterName="thruDateLabel" parameterValue=""/>
</moqui.service.job.ServiceJob>

</entity-facade-xml>
90 changes: 90 additions & 0 deletions template/graphQL/BulkOrderDiscountCodeApplQuery.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<#ftl output_format="HTML">
<#--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->

<@compress single_line=true>

<#if queryParams?has_content>
<#if queryParams.filterQuery?has_content>
<#assign filterQuery = queryParams.filterQuery/>
<#else>
<#if queryParams.fromDateLabel?has_content>
<#assign fromDateLabel = queryParams.fromDateLabel/>
<#else>
<#assign fromDateLabel = "created_at"/>
</#if>
<#if queryParams.thruDateLabel?has_content>
<#assign thruDateLabel = queryParams.thruDateLabel/>
<#else>
<#assign thruDateLabel = "created_at"/>
</#if>
<#if queryParams.fromDate?has_content && !queryParams.thruDate?has_content>
<#assign filterQuery = "${fromDateLabel}:>'${queryParams.fromDate}'"/>
</#if>
<#if queryParams.thruDate?has_content && !queryParams.fromDate?has_content>
<#assign filterQuery = "${thruDateLabel}:<'${queryParams.thruDate}'"/>
</#if>
<#if queryParams.fromDate?has_content && queryParams.thruDate?has_content>
<#assign filterQuery = "${fromDateLabel}:>'${queryParams.fromDate}' AND ${thruDateLabel}:<'${queryParams.thruDate}'"/>
</#if>
</#if>
</#if>

mutation {
bulkOperationRunQuery(
query: """ {
orders <#if filterQuery?has_content>(query:"${filterQuery}")</#if> {
edges {
node {
id
name
discountApplications {
edges {
node {
... on DiscountCodeApplication {
code
targetType
value {
... on MoneyV2 {
amount
currencyCode
}
... on PricingPercentageValue {
percentage
}
}
}
}
}
}
}
}
}
}
""" ) {
bulkOperation {
id
status
}
userErrors {
field
message
}
}
}

</@compress>