Improve parameter names and switch two state enum that will never hav…

…e third state to optional boolean

changelog.md

@@ -1,6 +1,6 @@
 # Next
 ## Minor
-- API: Extend `Query.users` to accept additional filter options `verificationStatus` & `loginWithinDays` 
+- API: Extend `Query.users` to accept additional filter options `emailVerified` & `lastLogin` 
 
 ## Breaking
 - Change argument format of `Query.workStatistics`, `Query.eventStatistics` & `Query.orderStatistics` from previous 

packages/api/src/schema/inputTypes.ts

@@ -277,10 +277,5 @@ export default [
       start: DateTime
       end: DateTime
     }
-
-    enum UserVerificationFilter {
-      VERIFIED
-      UNVERIFIED
-    }
   `,
 ];

packages/api/src/schema/query.ts

@@ -19,8 +19,8 @@ export default [
         includeGuests: Boolean = false
         queryString: String
         sort: [SortOptionInput!]
-        verificationStatus: UserVerificationFilter
-        loginWithinDays: DateFilterInput
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
       ): [User!]!
 
       """
@@ -29,8 +29,8 @@ export default [
       usersCount(
         includeGuests: Boolean = false
         queryString: String
-        verificationStatus: UserVerificationFilter
-        loginWithinDays: DateFilterInput
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
       ): Int!
 
       """

packages/core-users/src/module/configureUsersModule.ts

@@ -1,6 +1,6 @@
 import localePkg from 'locale';
 import { ModuleInput, UnchainedCore } from '@unchainedshop/types/core.js';
-import { User, UserQuery, UsersModule, UserVerificationFilter } from '@unchainedshop/types/user.js';
+import { User, UserQuery, UsersModule } from '@unchainedshop/types/user.js';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { emit, registerEvents } from '@unchainedshop/events';
 import { generateDbFilterById, buildSortOptions, mongodb } from '@unchainedshop/mongodb';
@@ -33,26 +33,23 @@ export const removeConfidentialServiceHashes = (rawUser: User): User => {
 export const buildFindSelector = ({
   includeGuests,
   queryString,
-  verificationStatus = null,
-  loginWithinDays = {},
+  emailVerified = null,
+  lastLogin = {},
   ...rest
 }: UserQuery) => {
   const selector: mongodb.Filter<User> = { ...rest, deleted: null };
   if (!includeGuests) selector.guest = { $in: [false, null] };
-  if (verificationStatus === UserVerificationFilter.VERIFIED) {
+  if (emailVerified === true) {
     selector['emails.verified'] = true;
   }
-  if (verificationStatus === UserVerificationFilter.UNVERIFIED) {
+  if (emailVerified === false) {
     selector['emails.verified'] = false;
   }
-  if (loginWithinDays?.end || loginWithinDays?.start) {
-    if (loginWithinDays?.end && loginWithinDays?.start)
-      selector['lastLogin.timestamp'] = {
-        $gte: loginWithinDays?.start,
-        $lte: loginWithinDays?.end,
-      };
-    else if (loginWithinDays?.end) selector['lastLogin.timestamp'] = { $lte: loginWithinDays?.end };
-    else if (loginWithinDays?.start) selector['lastLogin.timestamp'] = { $gte: loginWithinDays?.start };
+  if (lastLogin?.end) {
+    selector['lastLogin.timestamp'] = { $lte: lastLogin?.end };
+  }
+  if (lastLogin?.start) {
+    selector['lastLogin.timestamp'] = { $gte: lastLogin?.start };
   }
   if (queryString) {
     (selector as any).$text = { $search: queryString };

packages/types/user.ts

@@ -11,11 +11,6 @@ export enum UserOrderFilter {
   NO_ORDERS = 'NO_ORDERS',
 }
 
-export enum UserVerificationFilter {
-  VERIFIED = 'VERIFIED',
-  UNVERIFIED = 'UNVERIFIED',
-}
-
 export enum UserCartFilter {
   HAS_CART = 'HAS_CART',
   NO_CART = 'NO_CART',
@@ -102,8 +97,8 @@ export type User = {
 export type UserQuery = Filter<User> & {
   includeGuests?: boolean;
   queryString?: string;
-  verificationStatus?: UserVerificationFilter;
-  loginWithinDays?: DateFilterInput;
+  emailVerified?: boolean;
+  lastLogin?: DateFilterInput;
 };
 
 /*