strapi-plugin-comments 2.2.0 → 2.2.2-beta.1

package/server/services/graphql.js

@@ -1,7 +1,9 @@
 "use strict";
 const fp_1 = require("lodash/fp");
 const nexus_1 = require("nexus");
+const functions_1 = require("../utils/functions");
 const virtualScalarAttributes = ["id"];
+const customFields = ["filterBy", "filterByValue"];
 module.exports = ({ strapi }) => {
     const { service: getService } = strapi.plugin("graphql");
     const rootLevelOperators = () => {
@@ -40,6 +42,8 @@ module.exports = ({ strapi }) => {
                 for (const operator of rootLevelOperators()) {
                     operator.add(t, filtersTypeName);
                 }
+                t.field("filterBy", { type: "String" });
+                t.field("filterByValue", { type: "String" });
             },
         });
     };
@@ -78,17 +82,23 @@ module.exports = ({ strapi }) => {
         }
         return result;
     };
-    const graphQLFiltersToStrapiQuery = (filters, contentType = {}) => {
+    const graphQLFiltersToStrapiQuery = (queryFilters, contentType = {}) => {
         const { isStrapiScalar, isMedia, isRelation } = getService("utils").attributes;
         const { operators } = getService("builders").filters;
         const ROOT_LEVEL_OPERATORS = [operators.and, operators.or, operators.not];
-        if ((0, fp_1.isNil)(filters)) {
+        if ((0, fp_1.isNil)(queryFilters)) {
             return {};
         }
-        if (Array.isArray(filters)) {
-            return filters.map((filtersItem) => graphQLFiltersToStrapiQuery(filtersItem, contentType));
+        if (Array.isArray(queryFilters)) {
+            return queryFilters.reduce((acc, filtersItem) => {
+                if (!customFields.includes(filtersItem)) {
+                    acc.push(graphQLFiltersToStrapiQuery(filtersItem, contentType));
+                }
+                return acc;
+            });
         }
         const resultMap = {};
+        const { filterBy, filterByValue, ...filters } = queryFilters;
         const { attributes } = contentType;
         const isAttribute = (attributeName) => {
             return (virtualScalarAttributes.includes(attributeName) ||
@@ -114,6 +124,21 @@ module.exports = ({ strapi }) => {
                 }
             }
         }
+        if (filterBy === "DATE_CREATED") {
+            const date = new Date(filterByValue);
+            if (!filterByValue || Number.isNaN(+date)) {
+                throw new Error('Invalid date specified in "filterByValue"');
+            }
+            const start = date.setHours(0, 0, 0, 0);
+            const end = date.setHours(23, 59, 59, 999);
+            resultMap.createdAt = {
+                $between: [start, end],
+            };
+        }
+        if (filterBy === "APPROVAL_STATUS") {
+            (0, functions_1.assertNotEmpty)(filterByValue, new Error('Empty "filterByValue" parameter'));
+            resultMap.approvalStatus = filterByValue;
+        }
         return resultMap;
     };
     const serviceMethods = {

package/server/services/utils/functions.d.ts

@@ -1,4 +1,4 @@
-import { Id, StrapiUser } from "strapi-typed";
+import { Id, StrapiAdmin, StrapiUser } from "strapi-typed";
 import { Comment, ToBeFixed } from "../../../types";
 import PluginError from "./../../utils/error";
 export declare const buildNestedStructure: (entities: Array<Comment>, id?: Id | null, field?: string, dropBlockedThreads?: boolean, blockNestedThreads?: boolean) => Array<Comment>;
@@ -10,4 +10,5 @@ export declare const convertContentTypeNameToSlug: (str: string) => string;
 export declare const buildAuthorModel: (item: Comment, fieldsToPopulate?: Array<string>) => Comment;
 export declare const buildConfigQueryProp: (prop?: undefined | string | Array<string>) => string;
 export declare const resolveUserContextError: (user: StrapiUser) => PluginError;
+export declare const getAuthorName: (author: StrapiAdmin) => any;
 //# sourceMappingURL=functions.d.ts.map

package/server/services/utils/functions.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUserContextError = exports.buildConfigQueryProp = exports.buildAuthorModel = exports.convertContentTypeNameToSlug = exports.filterOurResolvedReports = exports.getModelUid = exports.getRelatedGroups = exports.isEqualEntity = exports.buildNestedStructure = void 0;
+exports.getAuthorName = exports.resolveUserContextError = exports.buildConfigQueryProp = exports.buildAuthorModel = exports.convertContentTypeNameToSlug = exports.filterOurResolvedReports = exports.getModelUid = exports.getRelatedGroups = exports.isEqualEntity = exports.buildNestedStructure = void 0;
 const error_1 = __importDefault(require("./../../utils/error"));
 const constants_1 = require("./../../utils/constants");
 const lodash_1 = require("lodash");
@@ -105,4 +105,12 @@ const resolveUserContextError = (user) => {
     }
 };
 exports.resolveUserContextError = resolveUserContextError;
+const getAuthorName = (author) => {
+    const { lastname, username, firstname } = author;
+    if (lastname)
+        return `${firstname} ${lastname}`;
+    else
+        return username || firstname;
+};
+exports.getAuthorName = getAuthorName;
 //# sourceMappingURL=functions.js.map

package/strapi-server.d.ts

@@ -64,6 +64,10 @@ declare const _default: () => {
                         type: string;
                         configurable: boolean;
                     };
+                    isAdminComment: {
+                        type: string;
+                        configurable: boolean;
+                    };
                     removed: {
                         type: string;
                         configurable: boolean;