Skip to content

Don't subscribe to all media #2073

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
merged 3 commits into from
Apr 4, 2017
Merged

Don't subscribe to all media #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8385670
Don't subscribe to all media
mikemurray Apr 3, 2017
9701b76
De-duplicate fetch product media functionality
mikemurray Apr 3, 2017
13809d1
Update logic of if / else inclusion / exclusion by workflow
mikemurray Apr 4, 2017
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
6 changes: 2 additions & 4 deletions server/publications/collections/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ Meteor.publish("Media", function (shops) {
});
}

return Media.find(selector, {
sort: {
"metadata.priority": 1
}
return Media.find({
"metadata.type": "brandAsset"
});
});
69 changes: 63 additions & 6 deletions server/publications/collections/product.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,45 @@
import { Products, Revisions } from "/lib/collections";
import { Media, Products, Revisions } from "/lib/collections";
import { Logger, Reaction } from "/server/api";
import { RevisionApi } from "/imports/plugins/core/revisions/lib/api/revisions";

export function findProductMedia(publicationInstance, productIds) {
const shopId = Reaction.getShopId();
const selector = {};

if (!shopId) {
return publicationInstance.ready();
}

if (Array.isArray(productIds)) {
selector["metadata.productId"] = {
$in: productIds
};
} else {
selector["metadata.productId"] = productIds;
}

if (shopId) {
selector["metadata.shopId"] = shopId;
}

// No one needs to see archived images on products
selector["metadata.workflow"] = {
$nin: ["archived"]
};

// Product editors can see both published and unpublished images
if (!Reaction.hasPermission(["createProduct"], publicationInstance.userId)) {
selector["metadata.workflow"].$in = [null, "published"];
}

return Media.find(selector, {
sort: {
"metadata.priority": 1
}
});
}


/**
* product detail publication
* @param {String} productId - productId or handle
Expand Down Expand Up @@ -71,7 +109,10 @@ Meteor.publish("Product", function (productId) {
};

if (RevisionApi.isRevisionControlEnabled()) {
const handle = Products.find(selector).observeChanges({
const productCursor = Products.find(selector);
const productIds = productCursor.map(p => p._id);

const handle = productCursor.observeChanges({
added: (id, fields) => {
const revisions = Revisions.find({
"documentId": id,
Expand Down Expand Up @@ -156,13 +197,29 @@ Meteor.publish("Product", function (productId) {
handle2.stop();
});

return this.ready();
return [
findProductMedia(this, productIds)
];
}

// Revision control is disabled
return Products.find(selector);
// Revision control is disabled, but is an admin
const productCursor = Products.find(selector);
const productIds = productCursor.map(p => p._id);
const mediaCursor = findProductMedia(this, productIds);

return [
productCursor,
mediaCursor
];
}

// Everyone else gets the standard, visibile products and variants
return Products.find(selector);
const productCursor = Products.find(selector);
const productIds = productCursor.map(p => p._id);
const mediaCursor = findProductMedia(this, productIds);

return [
productCursor,
mediaCursor
];
});
42 changes: 32 additions & 10 deletions server/publications/collections/products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Products, Revisions } from "/lib/collections";
import { Reaction, Logger } from "/server/api";
import { RevisionApi } from "/imports/plugins/core/revisions/lib/api/revisions";
import { findProductMedia } from "./product";

//
// define search filters as a schema so we can validate
Expand Down Expand Up @@ -273,7 +274,8 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
}

if (RevisionApi.isRevisionControlEnabled()) {
const handle = Products.find(newSelector).observeChanges({
const productCursor = Products.find(newSelector);
const handle = productCursor.observeChanges({
added: (id, fields) => {
const revisions = Revisions.find({
"$or": [
Expand Down Expand Up @@ -366,13 +368,25 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
handle2.stop();
});

return this.ready();
const mediaProductIds = productCursor.fetch().map((p) => p._id);
const mediaCursor = findProductMedia(this, mediaProductIds);

return [
mediaCursor
];
}
// Revision control is disabled
return Products.find(newSelector, {
// Revision control is disabled, but is admin
const productCursor = Products.find(newSelector, {
sort: sort,
limit: productScrollLimit
});
const mediaProductIds = productCursor.fetch().map((p) => p._id);
const mediaCursor = findProductMedia(this, mediaProductIds);

return [
productCursor,
mediaCursor
];
}

// Everyone else gets the standard, visible products
Expand Down Expand Up @@ -406,11 +420,19 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
});
}
// Returning Complete product tree for top level products to avoid sold out warning.
return Products.find(
{
$or: [ { _id: { $in: productIds } },
{ ancestors: { $in: productIds } }
]
});
const productCursor = Products.find({
$or: [
{ _id: { $in: productIds } },
{ ancestors: { $in: productIds } }
]
});

const mediaProductIds = productCursor.fetch().map((p) => p._id);
const mediaCursor = findProductMedia(this, mediaProductIds);

return [
productCursor,
mediaCursor
];
}
});