Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor: only update fulfillment group for which id is provided #5723

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

Merged
aldeed merged 1 commit into from
Oct 23, 2019
Merged

refactor: only update fulfillment group for which id is provided #5723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions imports/node-app/core-services/orders/mutations/updateOrderFulfillmentGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import SimpleSchema from "simpl-schema";
import ReactionError from "@reactioncommerce/reaction-error";
import { Order as OrderSchema } from "../simpleSchemas.js";

const inputSchema = new SimpleSchema({
tracking: {
Expand Down Expand Up @@ -56,33 +55,34 @@ export default async function updateOrderFulfillmentGroup(context, input) {

const modifier = {
$set: {
"shipping.$.updatedAt": new Date(),
"shipping.$[group].updatedAt": new Date(),
"updatedAt": new Date()
}
};

if (tracking) modifier.$set["shipping.$.tracking"] = tracking;
if (trackingUrl) modifier.$set["shipping.$.trackingUrl"] = trackingUrl;
if (tracking) modifier.$set["shipping.$[group].tracking"] = tracking;
if (trackingUrl) modifier.$set["shipping.$[group].trackingUrl"] = trackingUrl;

if (status && orderFulfillmentGroup.workflow.status !== status) {
modifier.$set["shipping.$.workflow.status"] = status;
modifier.$set["shipping.$[group].workflow.status"] = status;
modifier.$push = {
"shipping.$.workflow.workflow": status
"shipping.$[group].workflow.workflow": status
};
}

// Skip updating if we have no updates to make
if (Object.keys(modifier.$set).length === 2) return { order };

OrderSchema.validate(modifier, { modifier: true });

const { modifiedCount, value: updatedOrder } = await Orders.findOneAndUpdate(
{
"_id": orderId,
"shipping._id": orderFulfillmentGroupId
},
modifier,
{ returnOriginal: false }
{
arrayFilters: [{ "group._id": orderFulfillmentGroupId }],
returnOriginal: false
}
);
if (modifiedCount === 0 || !updatedOrder) throw new ReactionError("server-error", "Unable to update order");

Expand Down
15 changes: 9 additions & 6 deletions imports/node-app/core-services/orders/mutations/updateOrderFulfillmentGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,19 @@ test("updates an order fulfillment group", async () => {
},
{
$set: {
"shipping.$.tracking": "TRACK_REF",
"shipping.$.trackingUrl": "http://track.me/TRACK_REF",
"shipping.$.updatedAt": jasmine.any(Date),
"shipping.$.workflow.status": "NEW_STATUS",
"shipping.$[group].tracking": "TRACK_REF",
"shipping.$[group].trackingUrl": "http://track.me/TRACK_REF",
"shipping.$[group].updatedAt": jasmine.any(Date),
"shipping.$[group].workflow.status": "NEW_STATUS",
"updatedAt": jasmine.any(Date)
},
$push: {
"shipping.$.workflow.workflow": "NEW_STATUS"
"shipping.$[group].workflow.workflow": "NEW_STATUS"
}
},
{ returnOriginal: false }
{
arrayFilters: [{ "group._id": "group1" }],
returnOriginal: false
}
);
});