@autofleet/sadot 0.6.8-beta.3 → 0.6.8

package/dist/scopes/filter.js

@@ -5,15 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFieldsSortScope = exports.scopeName = exports.customFieldsFilterScope = void 0;
 /* eslint-disable import/prefer-default-export */
-// eslint-disable-next-line import/no-extraneous-dependencies
-const dayjs_1 = __importDefault(require("dayjs"));
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const common_types_1 = require("@autofleet/common-types");
+const moment_1 = __importDefault(require("moment"));
 const helpers_1 = require("../utils/helpers");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
 const castIfNeeded = (conditionValue) => {
-    if ((0, dayjs_1.default)(conditionValue).isValid()) {
+    if (moment_1.default.isDate(conditionValue)) {
         return '::timestamp';
     }
     if (!Number.isNaN(Number(conditionValue))) {

package/dist/tests/helpers/database-config.d.ts

@@ -10,10 +10,7 @@ declare const _default: {
             underscored: boolean;
             underscoredAll: boolean;
         };
-        logging: {
-            (...data: any[]): void;
-            (message?: any, ...optionalParams: any[]): void;
-        };
+        logging: boolean;
     };
 };
 export default _default;

package/dist/tests/helpers/database-config.js

@@ -12,6 +12,6 @@ exports.default = {
             underscored: true,
             underscoredAll: true,
         },
-        logging: console.log,
+        logging: false,
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.6.8-beta.3",
+  "version": "0.6.8",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -34,9 +34,9 @@
     "@autofleet/errors": "^1.0.10",
     "@autofleet/events": "^2.0.0",
     "@autofleet/logger": "^2.0.5",
-    "dayjs": "^1.11.11",
     "express": "^4.18.2",
     "joi": "^17.7.0",
+    "moment": "^2.30.1",
     "pg": "^8.10.0",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.31.1",

package/src/scopes/filter.ts

@@ -1,9 +1,8 @@
 /* eslint-disable import/prefer-default-export */
-// eslint-disable-next-line import/no-extraneous-dependencies
-import dayjs from 'dayjs';
 import { Op, type WhereOptions } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
 import { customFields } from '@autofleet/common-types';
+import moment from 'moment';
 import { generateRandomString } from '../utils/helpers';
 
 const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
@@ -30,14 +29,13 @@ export type CustomFieldFilterOptions = {
 }
 
 const castIfNeeded = (conditionValue: string): string => {
-  if (dayjs(conditionValue).isValid()) {
+  if (moment.isDate(conditionValue)) {
     return '::timestamp';
   } if (!Number.isNaN(Number(conditionValue))) {
     return '::numeric';
   }
   return '';
 };
-
 const AND_DELIMETER = ' AND ';
 
 /**

package/src/tests/helpers/database-config.ts

@@ -10,6 +10,6 @@ export default {
       underscored: true,
       underscoredAll: true,
     },
-    logging: console.log,
+    logging: false,
   },
 };