@unchainedshop/api 2.17.0 → 2.18.0

package/lib/resolvers/queries/events/eventStatistics.d.ts

@@ -1,7 +1,7 @@
 import { Root, Context } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 export default function eventStatistics(root: Root, params: {
     types?: string[];
-    from?: Date;
-    to?: Date;
+    dateRange?: DateFilterInput;
 }, { userId, modules }: Context): Promise<import("@unchainedshop/types/events.js").EventReport[]>;
 //# sourceMappingURL=eventStatistics.d.ts.map

package/lib/resolvers/queries/events/eventStatistics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,eAAe,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IAAC,EAAE,CAAC,EAAE,IAAI,CAAA;CAAE,EACpD,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,mEAO7B"}
+{"version":3,"file":"eventStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,wBAA8B,eAAe,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,eAAe,CAAA;CAAE,EACzD,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,mEAQ7B"}

package/lib/resolvers/queries/events/eventStatistics.js

@@ -1,7 +1,8 @@
 import { log } from '@unchainedshop/logger';
 export default async function eventStatistics(root, params, { userId, modules }) {
-    log(`query eventStatistics ${params.types || ''} ${params.from || ''} ${params.to || ''}`, {
+    log(`query eventStatistics ${(params?.types || []).join(', ')}`, {
         userId,
+        ...(params?.dateRange || {}),
     });
     return modules.events.getReport(params);
 }

package/lib/resolvers/queries/events/eventStatistics.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,MAAoD,EACpD,EAAE,MAAM,EAAE,OAAO,EAAW;IAE5B,GAAG,CAAC,yBAAyB,MAAM,CAAC,KAAK,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACzF,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"eventStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,MAAyD,EACzD,EAAE,MAAM,EAAE,OAAO,EAAW;IAE5B,GAAG,CAAC,yBAAyB,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;QAC/D,MAAM;QACN,GAAG,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC;KAC7B,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}

package/lib/resolvers/queries/orders/orderStatistics.d.ts

@@ -1,6 +1,6 @@
 import { Root, Context } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 export default function orderStatistics(root: Root, params: {
-    from?: Date;
-    to?: Date;
+    dateRange?: DateFilterInput;
 }, { modules, userId }: Context): Promise<import("@unchainedshop/types/orders.js").OrderReport>;
 //# sourceMappingURL=orderStatistics.d.ts.map

package/lib/resolvers/queries/orders/orderStatistics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orderStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,eAAe,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,IAAI,CAAC;IAAC,EAAE,CAAC,EAAE,IAAI,CAAA;CAAE,EAClC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,iEAO7B"}
+{"version":3,"file":"orderStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,wBAA8B,eAAe,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAA;CAAE,EACvC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,iEAQ7B"}

package/lib/resolvers/queries/orders/orderStatistics.js

@@ -1,7 +1,8 @@
 import { log } from '@unchainedshop/logger';
 export default async function orderStatistics(root, params, { modules, userId }) {
-    log(`query orderStatistics ${params.from || ''} ${params.to || ''}`, {
+    log(`query orderStatistics `, {
         userId,
+        ...(params?.dateRange || {}),
     });
     return modules.orders.getReport(params);
 }

package/lib/resolvers/queries/orders/orderStatistics.js.map

@@ -1 +1 @@
-{"version":3,"file":"orderStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,MAAkC,EAClC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,MAAM,CAAC,IAAI,IAAI,EAAE,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACnE,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"orderStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/orders/orderStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAC3C,IAAU,EACV,MAAuC,EACvC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,wBAAwB,EAAE;QAC5B,MAAM;QACN,GAAG,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC;KAC7B,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}

package/lib/resolvers/queries/users/users.d.ts

@@ -1,8 +1,12 @@
 import { Context, Root, SortOption } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 import { UserQuery } from '@unchainedshop/types/user.js';
 export default function users(root: Root, params: UserQuery & {
     limit?: number;
     offset?: number;
     sort?: Array<SortOption>;
+    includeGuests?: boolean;
+    emailVerified?: boolean;
+    lastLogin?: DateFilterInput;
 }, { modules, userId }: Context): Promise<import("@unchainedshop/types/user.js").User[]>;
 //# sourceMappingURL=users.d.ts.map

package/lib/resolvers/queries/users/users.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/users/users.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,wBAA8B,KAAK,CACjC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,SAAS,GAAG;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1B,EACD,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,0DAY7B"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/users/users.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,wBAA8B,KAAK,CACjC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,SAAS,GAAG;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B,EACD,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,0DAa7B"}

package/lib/resolvers/queries/users/users.js

@@ -2,6 +2,7 @@ import { log } from '@unchainedshop/logger';
 export default async function users(root, params, { modules, userId }) {
     log(`query users ${params.limit} ${params.offset} ${params.queryString} ${params.includeGuests ? 'includeGuests' : ''}`, {
         userId,
+        ...(params || {}),
     });
     return modules.users.findUsers(params);
 }

package/lib/resolvers/queries/users/users.js.map

@@ -1 +1 @@
-{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/users/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,KAAK,CACjC,IAAU,EACV,MAIC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CACD,eAAe,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,IAChE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAC3C,EAAE,EACF;QACE,MAAM;KACP,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/users/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAK5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,KAAK,CACjC,IAAU,EACV,MAOC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CACD,eAAe,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,IAChE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAC3C,EAAE,EACF;QACE,MAAM;QACN,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;KAClB,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC"}

package/lib/resolvers/queries/worker/workStatistics.d.ts

@@ -1,7 +1,7 @@
 import { Root, Context } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 export default function workStatistics(root: Root, params: {
     types?: string[];
-    from?: Date;
-    to?: Date;
+    dateRange?: DateFilterInput;
 }, { modules, userId }: Context): Promise<import("@unchainedshop/types/worker.js").WorkerReport[]>;
 //# sourceMappingURL=workStatistics.d.ts.map

package/lib/resolvers/queries/worker/workStatistics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/worker/workStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,cAAc,CAC1C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IAAC,EAAE,CAAC,EAAE,IAAI,CAAA;CAAE,EACpD,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,oEAO7B"}
+{"version":3,"file":"workStatistics.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/queries/worker/workStatistics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,wBAA8B,cAAc,CAC1C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,CAAC,EAAE,eAAe,CAAA;CAAE,EACzD,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,oEAQ7B"}

package/lib/resolvers/queries/worker/workStatistics.js

@@ -1,7 +1,8 @@
 import { log } from '@unchainedshop/logger';
 export default async function workStatistics(root, params, { modules, userId }) {
-    log(`query workStatistics ${params.from || ''} ${params.to || ''}`, {
+    log(`query workStatistics ${(params?.types || []).join(', ')}`, {
         userId,
+        ...(params.dateRange || {}),
     });
     return modules.worker.getReport(params);
 }

package/lib/resolvers/queries/worker/workStatistics.js.map

@@ -1 +1 @@
-{"version":3,"file":"workStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/worker/workStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAAoD,EACpD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,wBAAwB,MAAM,CAAC,IAAI,IAAI,EAAE,IAAI,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QAClE,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"workStatistics.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/worker/workStatistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAAyD,EACzD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,wBAAwB,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;QAC9D,MAAM;QACN,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;KAC5B,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}

package/lib/schema/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":";AAAA,wBA4eE"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":";AAAA,wBAmfE"}

package/lib/schema/query.js

@@ -19,12 +19,19 @@ export default [
         includeGuests: Boolean = false
         queryString: String
         sort: [SortOptionInput!]
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
       ): [User!]!
 
       """
       Get total number of users in the system that match query
       """
-      usersCount(includeGuests: Boolean = false, queryString: String): Int!
+      usersCount(
+        includeGuests: Boolean = false
+        queryString: String
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
+      ): Int!
 
       """
       Specific user data if userId provided, else returns currently logged in
@@ -479,15 +486,15 @@ export default [
       """
       Returns aggregated report of all the events that occurred in the system
       """
-      eventStatistics(types: [String!], from: Timestamp, to: Timestamp): [EventStatistics!]!
+      eventStatistics(types: [String!], dateRange: DateFilterInput): [EventStatistics!]!
       """
       Returns aggregated report of all the orders that occurred in the system
       """
-      orderStatistics(from: Timestamp, to: Timestamp): OrderStatistics!
+      orderStatistics(dateRange: DateFilterInput): OrderStatistics!
       """
       Returns aggregated report of all the worker jobs that occurred in the system
       """
-      workStatistics(types: [String!], from: Timestamp, to: Timestamp): [WorkStatistics!]!
+      workStatistics(types: [String!], dateRange: DateFilterInput): [WorkStatistics!]!
     }
   `,
 ];

package/lib/schema/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0eb;CACF,CAAC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/schema/query.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAifb;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -41,34 +41,34 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
     "@apollo/server": "^4.11.2",
-    "cookie": "^1.0.1"
+    "cookie": "^1.0.2"
   },
   "optionalDependencies": {
     "express": "~4"
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.3",
-    "@unchainedshop/core": "^2.17.0",
-    "@unchainedshop/events": "^2.17.0",
-    "@unchainedshop/logger": "^2.17.0",
-    "@unchainedshop/roles": "^2.17.0",
-    "@unchainedshop/utils": "^2.17.0",
+    "@unchainedshop/core": "^2.18.0",
+    "@unchainedshop/events": "^2.18.0",
+    "@unchainedshop/logger": "^2.18.0",
+    "@unchainedshop/roles": "^2.18.0",
+    "@unchainedshop/utils": "^2.18.0",
     "accounting": "0.4.1",
-    "dataloader": "^2.2.2",
-    "graphql-scalars": "^1.23.0",
+    "dataloader": "^2.2.3",
+    "graphql-scalars": "^1.24.0",
     "graphql-upload": "^17.0.0",
     "locale": "0.1.0",
     "lodash.isnumber": "3.0.3",
     "memoizee": "^0.4.17"
   },
   "devDependencies": {
-    "@types/graphql-upload": "^16.0.7",
+    "@types/graphql-upload": "^17.0.0",
     "@types/locale": "^0.1.4",
-    "@types/node": "^22.9.0",
-    "@unchainedshop/types": "^2.17.0",
-    "express": "^4.21.1",
+    "@types/node": "^22.10.2",
+    "@unchainedshop/types": "^2.18.0",
+    "express": "^4.21.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }

package/src/resolvers/queries/events/eventStatistics.ts

@@ -1,13 +1,15 @@
 import { log } from '@unchainedshop/logger';
 import { Root, Context } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 
 export default async function eventStatistics(
   root: Root,
-  params: { types?: string[]; from?: Date; to?: Date },
+  params: { types?: string[]; dateRange?: DateFilterInput },
   { userId, modules }: Context,
 ) {
-  log(`query eventStatistics ${params.types || ''} ${params.from || ''} ${params.to || ''}`, {
+  log(`query eventStatistics ${(params?.types || []).join(', ')}`, {
     userId,
+    ...(params?.dateRange || {}),
   });
 
   return modules.events.getReport(params);

package/src/resolvers/queries/orders/orderStatistics.ts

@@ -1,13 +1,15 @@
 import { log } from '@unchainedshop/logger';
 import { Root, Context } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 
 export default async function orderStatistics(
   root: Root,
-  params: { from?: Date; to?: Date },
+  params: { dateRange?: DateFilterInput },
   { modules, userId }: Context,
 ) {
-  log(`query orderStatistics ${params.from || ''} ${params.to || ''}`, {
+  log(`query orderStatistics `, {
     userId,
+    ...(params?.dateRange || {}),
   });
 
   return modules.orders.getReport(params);

package/src/resolvers/queries/users/users.ts

@@ -1,5 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root, SortOption } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 import { UserQuery } from '@unchainedshop/types/user.js';
 
 export default async function users(
@@ -8,6 +9,9 @@ export default async function users(
     limit?: number;
     offset?: number;
     sort?: Array<SortOption>;
+    includeGuests?: boolean;
+    emailVerified?: boolean;
+    lastLogin?: DateFilterInput;
   },
   { modules, userId }: Context,
 ) {
@@ -17,6 +21,7 @@ export default async function users(
     }`,
     {
       userId,
+      ...(params || {}),
     },
   );
 

package/src/resolvers/queries/worker/workStatistics.ts

@@ -1,13 +1,15 @@
 import { log } from '@unchainedshop/logger';
 import { Root, Context } from '@unchainedshop/types/api.js';
+import { DateFilterInput } from '@unchainedshop/types/common.js';
 
 export default async function workStatistics(
   root: Root,
-  params: { types?: string[]; from?: Date; to?: Date },
+  params: { types?: string[]; dateRange?: DateFilterInput },
   { modules, userId }: Context,
 ) {
-  log(`query workStatistics ${params.from || ''} ${params.to || ''}`, {
+  log(`query workStatistics ${(params?.types || []).join(', ')}`, {
     userId,
+    ...(params.dateRange || {}),
   });
 
   return modules.worker.getReport(params);

package/src/schema/query.ts

@@ -19,12 +19,19 @@ export default [
         includeGuests: Boolean = false
         queryString: String
         sort: [SortOptionInput!]
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
       ): [User!]!
 
       """
       Get total number of users in the system that match query
       """
-      usersCount(includeGuests: Boolean = false, queryString: String): Int!
+      usersCount(
+        includeGuests: Boolean = false
+        queryString: String
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
+      ): Int!
 
       """
       Specific user data if userId provided, else returns currently logged in
@@ -479,15 +486,15 @@ export default [
       """
       Returns aggregated report of all the events that occurred in the system
       """
-      eventStatistics(types: [String!], from: Timestamp, to: Timestamp): [EventStatistics!]!
+      eventStatistics(types: [String!], dateRange: DateFilterInput): [EventStatistics!]!
       """
       Returns aggregated report of all the orders that occurred in the system
       """
-      orderStatistics(from: Timestamp, to: Timestamp): OrderStatistics!
+      orderStatistics(dateRange: DateFilterInput): OrderStatistics!
       """
       Returns aggregated report of all the worker jobs that occurred in the system
       """
-      workStatistics(types: [String!], from: Timestamp, to: Timestamp): [WorkStatistics!]!
+      workStatistics(types: [String!], dateRange: DateFilterInput): [WorkStatistics!]!
     }
   `,
 ];