Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions rest_server/src/controllers/item_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ const list = asyncHandler(async (req, res, next) => {
req.query.type,
req.query.source,
req.query.keyword,
req.query.tag ? req.query.tag.split(',') : undefined,
req.query.category ? req.query.category.split(',') : undefined,
req.userInfo,
);
res.status(200).json(result);
Expand Down
25 changes: 22 additions & 3 deletions rest_server/src/models/marketplace_item.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ class MarketplaceItem {
this.models = models;
}

async list(name, author, type, source, keyword, userInfo) {
async list(name, author, type, source, keyword, tags, categories, userInfo) {
const handler = modelSyncHandler(
async (name, author, type, source, keyword) => {
async (name, author, type, source, keyword, tags, categories) => {
const filterStatement = {};
if (name) {
filterStatement.name = name;
Expand All @@ -91,6 +91,16 @@ class MarketplaceItem {
if (source) {
filterStatement.source = source;
}
if (tags) {
filterStatement.tags = {
[Op.contains]: tags,
};
}
if (categories) {
filterStatement.categories = {
[Op.contains]: categories,
};
}
if (keyword) {
const lowerKeyword = toLower(keyword);
filterStatement[Op.or] = [
Expand Down Expand Up @@ -160,7 +170,16 @@ class MarketplaceItem {
},
);

return await handler(name, author, type, source, keyword, this.models);
return await handler(
name,
author,
type,
source,
keyword,
tags,
categories,
this.models,
);
}

async create(itemReq) {
Expand Down