@recursyve/nestjs-unique-codes-sequelize 8.0.0-beta.6 → 8.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-unique-codes-sequelize",
-    "version": "8.0.0-beta.6",
+    "version": "8.0.0-beta.8",
     "publishConfig": {
         "access": "public"
     },

package/services/unique-codes.service.d.ts

@@ -1,6 +1,6 @@
 import { UniqueCodes, UniqueCodesService } from "@recursyve/nestjs-unique-codes-core";
-import { SequelizeUniqueCodes } from "../models";
 import { Transaction } from "sequelize";
+import { SequelizeUniqueCodes } from "../models";
 interface SequelizeUniqueCodeOptions {
     transaction?: Transaction;
 }
@@ -13,6 +13,8 @@ export declare class SequelizeUniqueCodesService extends UniqueCodesService<Sequ
     findByCode(code: string, options?: SequelizeUniqueCodeOptions): Promise<UniqueCodes | null>;
     getByCodeAndType(code: string, type: string, options?: SequelizeUniqueCodeOptions): Promise<UniqueCodes>;
     findByCodeAndType(code: string, type: string, options?: SequelizeUniqueCodeOptions): Promise<UniqueCodes | null>;
+    findFromMetadata(metadata: Record<string, any>, options: SequelizeUniqueCodeOptions | undefined): Promise<UniqueCodes | null>;
+    findFromMetadataAndType(metadata: Record<string, any>, type: any, options: SequelizeUniqueCodeOptions | undefined): Promise<UniqueCodes | null>;
     validate(uniqueCode: string | UniqueCodes, options?: SequelizeUniqueCodeOptions): Promise<boolean>;
     use(id: number, metadata?: Record<string, any>, options?: SequelizeUniqueCodeOptions): Promise<void>;
 }

package/services/unique-codes.service.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequelizeUniqueCodesService = void 0;
 const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
 const sequelize_1 = require("@nestjs/sequelize");
 const nestjs_unique_codes_core_1 = require("@recursyve/nestjs-unique-codes-core");
-const models_1 = require("../models");
-const common_1 = require("@nestjs/common");
 const date_fns_1 = require("date-fns");
+const sequelize_2 = require("sequelize");
+const models_1 = require("../models");
 let SequelizeUniqueCodesService = class SequelizeUniqueCodesService extends nestjs_unique_codes_core_1.UniqueCodesService {
     constructor(repository) {
         super();
@@ -46,6 +47,36 @@ let SequelizeUniqueCodesService = class SequelizeUniqueCodesService extends nest
                 type
             } }, options));
     }
+    findFromMetadata(metadata, options) {
+        const conditions = [];
+        const where = {
+            [sequelize_2.Op.and]: conditions
+        };
+        for (const key in metadata) {
+            if (!(key in metadata)) {
+                continue;
+            }
+            conditions.push(sequelize_2.Sequelize.where(sequelize_2.Sequelize.fn("JSON_EXTRACT", sequelize_2.Sequelize.col("metadata"), sequelize_2.Sequelize.literal(`'$.${key}'`)), metadata[key]));
+        }
+        return this.repository.findOne({
+            where
+        });
+    }
+    findFromMetadataAndType(metadata, type, options) {
+        const conditions = [{ type }];
+        const where = {
+            [sequelize_2.Op.and]: conditions
+        };
+        for (const key in metadata) {
+            if (!(key in metadata)) {
+                continue;
+            }
+            conditions.push(sequelize_2.Sequelize.where(sequelize_2.Sequelize.fn("JSON_EXTRACT", sequelize_2.Sequelize.col("metadata"), sequelize_2.Sequelize.literal(`'$.${key}'`)), metadata[key]));
+        }
+        return this.repository.findOne({
+            where
+        });
+    }
     async validate(uniqueCode, options) {
         var _a, _b;
         if (typeof uniqueCode === "string") {
@@ -55,10 +86,11 @@ let SequelizeUniqueCodesService = class SequelizeUniqueCodesService extends nest
             return false;
         }
         const now = Date.now();
-        return (0, date_fns_1.isWithinInterval)(now, {
-            start: (_a = uniqueCode.validAt) !== null && _a !== void 0 ? _a : now,
-            end: (_b = uniqueCode.expiresAt) !== null && _b !== void 0 ? _b : now
-        });
+        const start = (_a = uniqueCode.validAt) !== null && _a !== void 0 ? _a : now;
+        const end = (_b = uniqueCode.expiresAt) !== null && _b !== void 0 ? _b : now;
+        if ((0, date_fns_1.isAfter)(start, end))
+            return false;
+        return (0, date_fns_1.isWithinInterval)(now, { start, end });
     }
     async use(id, metadata, options) {
         var _a;