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

Skip to content

refactor: move orders from server/no-meteor to node-app #5670

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 12 commits into from
Oct 7, 2019
Merged

refactor: move orders from server/no-meteor to node-app #5670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b49fef4
refactor: move orders to node-app
kieckhafer Oct 3, 2019
9254e2a
refactor: add `order` simpleSchema
kieckhafer Oct 4, 2019
4624e63
Merge branch 'develop' into refactor-kieckhafer-movePackageToNodeApp-…
kieckhafer Oct 4, 2019
5c59f5f
refactor: update simpleSchemas
kieckhafer Oct 4, 2019
5edcec6
Merge remote-tracking branch 'origin/develop' into refactor-kieckhafe…
kieckhafer Oct 4, 2019
78e4b68
refactor: simpleSchema updates
kieckhafer Oct 4, 2019
e5b7117
Merge branch 'develop' into refactor-kieckhafer-movePackageToNodeApp-…
aldeed Oct 5, 2019
cb32ff3
refactor: resolve import/integration test issues
aldeed Oct 5, 2019
8444643
chore: remove console.log
aldeed Oct 7, 2019
ed89d65
test: fix remaining Factory issues
aldeed Oct 7, 2019
b888955
Merge pull request #5685 from reactioncommerce/refactor-kieckhafer-mo…
aldeed Oct 7, 2019
25e19d5
fix: export MetaData
aldeed Oct 7, 2019
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
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/mutations/addCartItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ReactionError from "@reactioncommerce/reaction-error";
import hashLoginToken from "../../../core/util/hashLoginToken";
import hashToken from "@reactioncommerce/api-utils/hashToken";
import addCartItemsUtil from "../util/addCartItems.js";

/**
Expand Down Expand Up @@ -30,7 +30,7 @@ export default async function addCartItems(context, input, options = {}) {
throw new ReactionError("not-found", "Cart not found");
}

selector = { _id: cartId, anonymousAccessToken: hashLoginToken(token) };
selector = { _id: cartId, anonymousAccessToken: hashToken(token) };
}

const cart = await Cart.findOne(selector);
Expand Down
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/mutations/createCart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Random from "@reactioncommerce/random";
import ReactionError from "@reactioncommerce/reaction-error";
import Logger from "@reactioncommerce/logger";
import hashLoginToken from "../../../core/util/hashLoginToken";
import hashToken from "@reactioncommerce/api-utils/hashToken";
import addCartItems from "../util/addCartItems.js";

/**
Expand Down Expand Up @@ -62,7 +62,7 @@ export default async function createCart(context, input) {
const newCart = {
_id: Random.id(),
accountId,
anonymousAccessToken: anonymousAccessToken && hashLoginToken(anonymousAccessToken),
anonymousAccessToken: anonymousAccessToken && hashToken(anonymousAccessToken),
currencyCode: cartCurrencyCode,
createdAt,
items: updatedItemList,
Expand Down
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/mutations/reconcileCarts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Logger from "@reactioncommerce/logger";
import ReactionError from "@reactioncommerce/reaction-error";
import hashLoginToken from "../../../core/util/hashLoginToken";
import hashToken from "@reactioncommerce/api-utils/hashToken";
import convertAnonymousCartToNewAccountCart from "./convertAnonymousCartToNewAccountCart.js";
import reconcileCartsKeepAccountCart from "./reconcileCartsKeepAccountCart.js";
import reconcileCartsKeepAnonymousCart from "./reconcileCartsKeepAnonymousCart.js";
Expand Down Expand Up @@ -30,7 +30,7 @@ export default async function reconcileCarts(context, input) {
if (!anonymousCartToken) throw new ReactionError("invalid-param", "anonymousCartToken is required");

const accountCartSelector = { accountId };
const anonymousCartSelector = { _id: anonymousCartId, anonymousAccessToken: hashLoginToken(anonymousCartToken) };
const anonymousCartSelector = { _id: anonymousCartId, anonymousAccessToken: hashToken(anonymousCartToken) };

const carts = await Cart.find({
$or: [accountCartSelector, anonymousCartSelector]
Expand Down
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/mutations/removeCartItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SimpleSchema from "simpl-schema";
import ReactionError from "@reactioncommerce/reaction-error";
import hashLoginToken from "../../../core/util/hashLoginToken";
import hashToken from "@reactioncommerce/api-utils/hashToken";

const inputSchema = new SimpleSchema({
"cartId": String,
Expand Down Expand Up @@ -34,7 +34,7 @@ export default async function removeCartItems(context, input) {

const selector = { _id: cartId };
if (token) {
selector.anonymousAccessToken = hashLoginToken(token);
selector.anonymousAccessToken = hashToken(token);
} else if (accountId) {
selector.accountId = accountId;
} else {
Expand Down
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/mutations/setEmailOnAnonymousCart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SimpleSchema from "simpl-schema";
import ReactionError from "@reactioncommerce/reaction-error";
import hashLoginToken from "../../../core/util/hashLoginToken";
import hashToken from "@reactioncommerce/api-utils/hashToken";

const inputSchema = new SimpleSchema({
cartId: String,
Expand Down Expand Up @@ -29,7 +29,7 @@ export default async function setEmailOnAnonymousCart(context, input) {

const cart = await Cart.findOne({
_id: cartId,
anonymousAccessToken: hashLoginToken(token)
anonymousAccessToken: hashToken(token)
});
if (!cart) throw new ReactionError("not-found", "Cart not found");

Expand Down
2 changes: 1 addition & 1 deletion imports/node-app/core-services/cart/mutations/setShippingAddressOnCart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SimpleSchema from "simpl-schema";
import Random from "@reactioncommerce/random";
import { Address as AddressSchema } from "../simpleSchemas.js";
import { CartAddress as AddressSchema } from "../simpleSchemas.js";
import getCartById from "../util/getCartById.js";

const inputSchema = new SimpleSchema({
Expand Down
2 changes: 1 addition & 1 deletion imports/node-app/core-services/cart/mutations/setShippingAddressOnCart.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jest.mock("../util/getCartById", () => jest.fn().mockImplementation(() => Promis
}]
})));

const address = Factory.Address.makeOne({ _id: undefined });
const address = Factory.CartAddress.makeOne({ _id: undefined });

beforeAll(() => {
if (!mockContext.mutations.saveCart) {
Expand Down
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/queries/anonymousCartByCartId.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ReactionError from "@reactioncommerce/reaction-error";
import hashLoginToken from "../../../core/util/hashLoginToken.js";
import hashToken from "@reactioncommerce/api-utils/hashToken";

/**
* @name anonymousCartByCartId
Expand All @@ -22,6 +22,6 @@ export default async function anonymousCartByCartId(context, { cartId, token } =

return Cart.findOne({
_id: cartId,
anonymousAccessToken: hashLoginToken(token)
anonymousAccessToken: hashToken(token)
});
}
16 changes: 8 additions & 8 deletions imports/node-app/core-services/cart/simpleSchemas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const Metafield = new SimpleSchema({
});

/**
* @name Address
* @name CartAddress
* @memberof Schemas
* @type {SimpleSchema}
* @property {String} _id
Expand All @@ -70,7 +70,7 @@ const Metafield = new SimpleSchema({
* @property {Boolean} failedValidation
* @property {Metafield[]} metafields
*/
export const Address = new SimpleSchema({
export const CartAddress = new SimpleSchema({
"_id": {
type: String,
optional: true
Expand Down Expand Up @@ -323,7 +323,7 @@ const ShippingMethod = new SimpleSchema({
* @property {ShippingMethod} method ShippingMethod
* @property {Number} rate default value: `0.00`
*/
const ShipmentQuote = new SimpleSchema({
export const ShipmentQuote = new SimpleSchema({
carrier: {
type: String
},
Expand Down Expand Up @@ -460,7 +460,7 @@ const Workflow = new SimpleSchema({
});

/**
* @name Invoice
* @name CartInvoice
* @type {SimpleSchema}
* @memberof Schemas
* @property {Number} discounts Total of all discounts (a positive number, but subtracted from the grand total)
Expand All @@ -472,7 +472,7 @@ const Workflow = new SimpleSchema({
* @property {Number} taxes Total tax
* @property {Number} total Grand total
*/
const Invoice = new SimpleSchema({
export const CartInvoice = new SimpleSchema({
currencyCode: String,
discounts: {
type: Number,
Expand Down Expand Up @@ -546,7 +546,7 @@ const Shipment = new SimpleSchema({
optional: true
},
"address": {
type: Address,
type: CartAddress,
optional: true
},
"shipmentMethod": {
Expand Down Expand Up @@ -585,7 +585,7 @@ const Shipment = new SimpleSchema({
defaultValue: {}
},
"invoice": {
type: Invoice,
type: CartInvoice,
optional: true
},
"itemIds": {
Expand Down Expand Up @@ -826,7 +826,7 @@ export const Cart = new SimpleSchema({
},
"currencyCode": String,
"billingAddress": {
type: Address,
type: CartAddress,
optional: true
},
"sessionId": {
Expand Down
4 changes: 2 additions & 2 deletions imports/node-app/core-services/cart/util/getCartById.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ReactionError from "@reactioncommerce/reaction-error";
import hashLoginToken from "../../../core/util/hashLoginToken.js";
import hashToken from "@reactioncommerce/api-utils/hashToken";

/**
* @summary Gets a cart from the db by ID. If there is an account for the request, verifies that the
Expand All @@ -18,7 +18,7 @@ export default async function getCartById(context, cartId, { cartToken, throwIfN
const selector = { _id: cartId };

if (cartToken) {
selector.anonymousAccessToken = hashLoginToken(cartToken);
selector.anonymousAccessToken = hashToken(cartToken);
}

const cart = await Cart.findOne(selector);
Expand Down
14 changes: 7 additions & 7 deletions imports/node-app/core-services/catalog/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import resolvers from "./resolvers/index.js";
import schemas from "./schemas/index.js";
import startup from "./startup.js";
import {
Catalog,
CatalogProduct,
CatalogProductOption,
CatalogProductVariant,
ImageInfo,
ImageSizes,
ShippingParcel,
SocialMetadata,
VariantBaseSchema,
CatalogVariantSchema,
CatalogProduct,
Catalog
SocialMetadata
} from "./simpleSchemas.js";

/**
Expand Down Expand Up @@ -61,8 +61,8 @@ export default async function register(app) {
ImageSizes,
ShippingParcel,
SocialMetadata,
CatalogProductOption: VariantBaseSchema,
CatalogProductVariant: CatalogVariantSchema,
CatalogProductOption,
CatalogProductVariant,
CatalogProduct,
Catalog
}
Expand Down
18 changes: 9 additions & 9 deletions imports/node-app/core-services/catalog/simpleSchemas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SimpleSchema from "simpl-schema";
* @property {String} valueType optional
* @property {String} description optional
*/
export const Metafield = new SimpleSchema({
const Metafield = new SimpleSchema({
key: {
type: String,
max: 30,
Expand Down Expand Up @@ -160,7 +160,7 @@ export const SocialMetadata = new SimpleSchema({
});

/**
* @name VariantBaseSchema
* @name CatalogProductOption
* @memberof Schemas
* @type {SimpleSchema}
* @property {String} _id required
Expand All @@ -184,7 +184,7 @@ export const SocialMetadata = new SimpleSchema({
* @property {Number} weight optional, default value: `0`
* @property {Number} width optional, default value: `0`
*/
export const VariantBaseSchema = new SimpleSchema({
export const CatalogProductOption = new SimpleSchema({
"_id": {
type: String,
label: "Catalog product variant Id"
Expand Down Expand Up @@ -294,20 +294,20 @@ export const VariantBaseSchema = new SimpleSchema({
});

/**
* @name CatalogVariantSchema
* @name CatalogProductVariant
* @memberof Schemas
* @type {SimpleSchema}
* @extends VariantBaseSchema
* @property {VariantBaseSchema[]} options optional
* @extends CatalogProductOption
* @property {CatalogProductOption[]} options optional
*/
export const CatalogVariantSchema = VariantBaseSchema.clone().extend({
export const CatalogProductVariant = CatalogProductOption.clone().extend({
"options": {
type: Array,
label: "Variant Options",
optional: true
},
"options.$": {
type: VariantBaseSchema
type: CatalogProductOption
}
});

Expand Down Expand Up @@ -501,7 +501,7 @@ export const CatalogProduct = new SimpleSchema({
optional: true
},
"variants.$": {
type: CatalogVariantSchema
type: CatalogProductVariant
},
"vendor": {
type: String,
Expand Down
25 changes: 25 additions & 0 deletions imports/node-app/core-services/inventory/simpleSchemas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/**
* @summary Extend SimpleSchemas with inventory fields
* @param {Object} schemas Simple schemas
* @returns {undefined}
*/
export function extendInventorySchemas(schemas) {
/**
* @property {Boolean} isBackorder required, Indicates when a product is currently backordered
* @property {Boolean} isLowQuantity required, Indicates that the product quantity is too low
* @property {Boolean} isSoldOut required, Indicates when the product quantity is zero
*/
schemas.CatalogProduct.extend({
isBackorder: Boolean,
isLowQuantity: Boolean,
isSoldOut: Boolean
});

// Extend variants by adding a isSoldOut prop
const variantSchemaExtension = {
isSoldOut: Boolean
};

schemas.CatalogProductOption.extend(variantSchemaExtension);
schemas.CatalogProductVariant.extend(variantSchemaExtension);
}
21 changes: 3 additions & 18 deletions imports/node-app/core-services/inventory/utils/preStartup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
import { extendInventorySchemas } from "../simpleSchemas.js";

/**
* @summary Called pre startup
* @param {Object} context Startup context
* @param {Object} context.simpleSchemas Simple schemas
* @returns {undefined}
*/
export default async function preStartup(context) {
/**
* @property {Boolean} isBackorder required, Indicates when a product is currently backordered
* @property {Boolean} isLowQuantity required, Indicates that the product quantity is too low
* @property {Boolean} isSoldOut required, Indicates when the product quantity is zero
*/
context.simpleSchemas.CatalogProduct.extend({
isBackorder: Boolean,
isLowQuantity: Boolean,
isSoldOut: Boolean
});

// Extend variants by adding a isSoldOut prop
const variantSchemaExtension = {
isSoldOut: Boolean
};

context.simpleSchemas.CatalogProductOption.extend(variantSchemaExtension);
context.simpleSchemas.CatalogProductVariant.extend(variantSchemaExtension);
extendInventorySchemas(context.simpleSchemas);
}
4 changes: 2 additions & 2 deletions imports/node-app/core-services/inventory/utils/publishProductToCatalog.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ function getCatalogProduct() {
isBackorder: undefined,
isLowQuantity: undefined,
isSoldOut: undefined,
variants: Factory.CatalogVariantSchema.makeMany(1, {
variants: Factory.CatalogProductVariant.makeMany(1, {
isDeleted: false,
isSoldOut: undefined,
isVisible: true,
variantId: "TOP_VARIANT_1",
options: Factory.VariantBaseSchema.makeMany(2, {
options: Factory.CatalogProductOption.makeMany(2, {
isDeleted: false,
isSoldOut: undefined,
isVisible: true,
Expand Down
0 ...core/orders/server/no-meteor/i18n/ar.json → ...ode-app/core-services/orders/i18n/ar.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/bg.json → ...ode-app/core-services/orders/i18n/bg.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/cs.json → ...ode-app/core-services/orders/i18n/cs.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/de.json → ...ode-app/core-services/orders/i18n/de.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/el.json → ...ode-app/core-services/orders/i18n/el.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/en.json → ...ode-app/core-services/orders/i18n/en.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/es.json → ...ode-app/core-services/orders/i18n/es.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/fr.json → ...ode-app/core-services/orders/i18n/fr.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/he.json → ...ode-app/core-services/orders/i18n/he.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/hr.json → ...ode-app/core-services/orders/i18n/hr.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/hu.json → ...ode-app/core-services/orders/i18n/hu.json
View file
Open in desktop
File renamed without changes.
0 ...ore/orders/server/no-meteor/i18n/index.js → ...de-app/core-services/orders/i18n/index.js
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/it.json → ...ode-app/core-services/orders/i18n/it.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/my.json → ...ode-app/core-services/orders/i18n/my.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/nb.json → ...ode-app/core-services/orders/i18n/nb.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/nl.json → ...ode-app/core-services/orders/i18n/nl.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/pl.json → ...ode-app/core-services/orders/i18n/pl.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/pt.json → ...ode-app/core-services/orders/i18n/pt.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/ro.json → ...ode-app/core-services/orders/i18n/ro.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/ru.json → ...ode-app/core-services/orders/i18n/ru.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/sl.json → ...ode-app/core-services/orders/i18n/sl.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/sv.json → ...ode-app/core-services/orders/i18n/sv.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/tr.json → ...ode-app/core-services/orders/i18n/tr.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/vi.json → ...ode-app/core-services/orders/i18n/vi.json
View file
Open in desktop
File renamed without changes.
0 ...core/orders/server/no-meteor/i18n/zh.json → ...ode-app/core-services/orders/i18n/zh.json
View file
Open in desktop
File renamed without changes.
17 changes: 9 additions & 8 deletions .../core/orders/server/no-meteor/register.js → ...ts/node-app/core-services/orders/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { OrderFulfillmentGroup, OrderItem } from "/imports/collections/schemas";
import i18n from "./i18n";
import mutations from "./mutations";
import i18n from "./i18n/index.js";
import mutations from "./mutations/index.js";
import preStartup from "./preStartup.js";
import queries from "./queries";
import resolvers from "./resolvers";
import schemas from "./schemas";
import startup from "./startup";
import getDataForOrderEmail from "./util/getDataForOrderEmail";
import queries from "./queries/index.js";
import resolvers from "./resolvers/index.js";
import schemas from "./schemas/index.js";
import { Order, OrderFulfillmentGroup, OrderItem } from "./simpleSchemas";
import startup from "./startup.js";
import getDataForOrderEmail from "./util/getDataForOrderEmail.js";

/**
* @summary Import and call this function to add this plugin to your API.
Expand Down Expand Up @@ -51,6 +51,7 @@ export default async function register(app) {
mutations,
queries,
simpleSchemas: {
Order,
OrderFulfillmentGroup,
OrderItem
},
Expand Down
0 ...s__/addOrderFulfillmentGroup.test.js.snap → ...s__/addOrderFulfillmentGroup.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ..._snapshots__/cancelOrderItem.test.js.snap → ..._snapshots__/cancelOrderItem.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ...s/__snapshots__/createRefund.test.js.snap → ...s/__snapshots__/createRefund.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ...__snapshots__/moveOrderItems.test.js.snap → ...__snapshots__/moveOrderItems.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ...ons/__snapshots__/placeOrder.test.js.snap → ...ons/__snapshots__/placeOrder.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ...__snapshots__/splitOrderItem.test.js.snap → ...__snapshots__/splitOrderItem.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ...ns/__snapshots__/updateOrder.test.js.snap → ...ns/__snapshots__/updateOrder.test.js.snap
View file
Open in desktop
File renamed without changes.
0 .../updateOrderFulfillmentGroup.test.js.snap → .../updateOrderFulfillmentGroup.test.js.snap
View file
Open in desktop
File renamed without changes.
Loading