my-q-format-response-aws-lambda 1.0.60 → 1.0.62

package/index.js

@@ -379,6 +379,9 @@ const messagesREST = (prefix, suffix = '') => {
         USER_REGISTRATION: `${prefix}_USER_REGISTRATION${suffix}`,
         NOT_USER_REGISTRATION: `${prefix}_NOT_USER_REGISTRATION${suffix}`,
         ERROR_USER_REGISTRATION: `${prefix}_ERROR_USER_REGISTRATION${suffix}`,
+        USER_ALREADY_REGISTERED: `${prefix}_USER_ALREADY_REGISTERED${suffix}`,
+        USER_DID_NOT_REGISTER: `${prefix}_USER_DID_NOT_REGISTER${suffix}`,
+        ERROR_USER_ALREADY_REGISTERED: `${prefix}_ERROR_USER_ALREADY_REGISTERED${suffix}`,
         USER_LOGIN: `${prefix}_USER_LOGIN${suffix}`,
         NOT_USER_LOGIN: `${prefix}_NOT_USER_LOGIN${suffix}`,
         ERROR_USER_LOGIN: `${prefix}_ERROR_USER_LOGIN${suffix}`,
@@ -430,12 +433,13 @@ exports.normaliseMongoFilter = normaliseMongoFilter;
  * @param filter
  */
 const normaliseMongoPaginate = (filter) => {
-    let res = {
-        skip: 0,
-        limit: 50,
-    };
-    res.skip = filter && filter.skip ? parseInt(filter.skip, 10) || 0 : 0;
-    res.limit = filter && filter.limit ? parseInt(filter.limit, 10) || 50 : 50;
+    let res = {};
+    if (filter.hasOwnProperty('limit') && filter.hasOwnProperty('skip')) {
+        res = {
+            skip: filter.skip ? parseInt(filter.skip, 10) : 0,
+            limit: filter.limit ? parseInt(filter.limit, 10) : 50,
+        };
+    }
     return res;
 };
 exports.normaliseMongoPaginate = normaliseMongoPaginate;

package/index.ts

@@ -535,6 +535,10 @@ export const messagesREST = (prefix: string, suffix: string = ''): Record<string
     NOT_USER_REGISTRATION: `${prefix}_NOT_USER_REGISTRATION${suffix}`,
     ERROR_USER_REGISTRATION: `${prefix}_ERROR_USER_REGISTRATION${suffix}`,
 
+    USER_ALREADY_REGISTERED: `${prefix}_USER_ALREADY_REGISTERED${suffix}`,
+    USER_DID_NOT_REGISTER: `${prefix}_USER_DID_NOT_REGISTER${suffix}`,
+    ERROR_USER_ALREADY_REGISTERED: `${prefix}_ERROR_USER_ALREADY_REGISTERED${suffix}`,
+
     USER_LOGIN: `${prefix}_USER_LOGIN${suffix}`,
     NOT_USER_LOGIN: `${prefix}_NOT_USER_LOGIN${suffix}`,
     ERROR_USER_LOGIN: `${prefix}_ERROR_USER_LOGIN${suffix}`,
@@ -600,10 +604,12 @@ export const normaliseMongoFilter = (
   return _filter
 }
 
-export interface TMongoPaginate {
-  skip: number
-  limit: number
-}
+export type TMongoPaginate =
+  | {
+      skip: number
+      limit: number
+    }
+  | {}
 
 export type TFieldsGQL =
   | 'create'
@@ -629,13 +635,14 @@ export type TFieldsGQL =
  * @param filter
  */
 export const normaliseMongoPaginate = (filter: TMongoFilterNormalise): TMongoPaginate => {
-  let res: TMongoPaginate = {
-    skip: 0,
-    limit: 50,
-  }
+  let res: TMongoPaginate = {}
 
-  res.skip = filter && filter.skip ? parseInt(filter.skip, 10) || 0 : 0
-  res.limit = filter && filter.limit ? parseInt(filter.limit, 10) || 50 : 50
+  if (filter.hasOwnProperty('limit') && filter.hasOwnProperty('skip')) {
+    res = {
+      skip: filter.skip ? parseInt(filter.skip, 10) : 0,
+      limit: filter.limit ? parseInt(filter.limit, 10) : 50,
+    }
+  }
 
   return res
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-q-format-response-aws-lambda",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "homepage": "https://github.com/zhukyuri/my-q-format-response-aws-lambda",
   "description": "my-q-format-response-aws-lambda",
   "main": "index.js",