gemcap-be-common 1.4.113 → 1.4.115

package/models/FinancialSpreadingAlias.model.d.ts

@@ -25,7 +25,10 @@
 import mongoose, { Model } from 'mongoose';
 export interface IFinancialSpreadingAlias {
     sheetId: mongoose.Types.ObjectId;
-    aliases: string[];
+    aliases: {
+        original: string;
+        normalized: string;
+    }[];
 }
 export interface IFinancialSpreadingAliasDoc extends IFinancialSpreadingAlias, Document {
     _id: mongoose.Types.ObjectId;
@@ -48,3 +51,4 @@ export declare const FinancialSpreadingAliasSchema: mongoose.Schema<IFinancialSp
     _id: mongoose.Types.ObjectId;
 }>;
 export declare const FinancialSpreadingAlias: TFinancialSpreadingAliasModel;
+export declare function normalizeAlias(input: string): string;

package/models/FinancialSpreadingAlias.model.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FinancialSpreadingAlias = exports.FinancialSpreadingAliasSchema = void 0;
+exports.normalizeAlias = exports.FinancialSpreadingAlias = exports.FinancialSpreadingAliasSchema = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
 const _models_1 = require("./_models");
 exports.FinancialSpreadingAliasSchema = new mongoose_1.default.Schema({
@@ -13,12 +13,40 @@ exports.FinancialSpreadingAliasSchema = new mongoose_1.default.Schema({
         required: true,
     },
     aliases: [{
-            type: String,
-            required: false,
-            trim: true,
-            default: '',
+            original: {
+                type: String,
+                required: false,
+                trim: true,
+            },
+            normalized: {
+                type: String,
+                required: false,
+                trim: true,
+            },
         }],
 }, {
     timestamps: { createdAt: true, updatedAt: true },
 });
 exports.FinancialSpreadingAlias = mongoose_1.default.model(_models_1.MODEL_NAMES.financialSpreadingAlias, exports.FinancialSpreadingAliasSchema);
+exports.FinancialSpreadingAliasSchema.index({
+    'aliases.normalized': 1,
+});
+exports.FinancialSpreadingAliasSchema.pre('validate', function (next) {
+    this.aliases = this.aliases
+        .filter(a => a.original?.trim())
+        .map(a => ({
+        original: a.original.trim(),
+        normalized: normalizeAlias(a.original),
+    }));
+    next();
+});
+function normalizeAlias(input) {
+    return input
+        .toLowerCase()
+        .replace(/[–—−]/g, '-')
+        .replace(/[_]/g, ' ')
+        .replace(/[^\p{L}\p{N}\s-]/gu, '')
+        .replace(/\s+/g, ' ')
+        .trim();
+}
+exports.normalizeAlias = normalizeAlias;

package/models/FinancialSpreadingAlias.model.ts

@@ -4,7 +4,10 @@ import { MODEL_NAMES } from './_models';
 
 export interface IFinancialSpreadingAlias {
   sheetId: mongoose.Types.ObjectId;
-  aliases: string[];
+  aliases: {
+    original: string;
+    normalized: string;
+  }[];
 }
 
 export interface IFinancialSpreadingAliasDoc extends IFinancialSpreadingAlias, Document {
@@ -36,10 +39,16 @@ export const FinancialSpreadingAliasSchema = new mongoose.Schema<IFinancialSprea
       required: true,
     },
     aliases: [{
-      type: String,
-      required: false,
-      trim: true,
-      default: '',
+      original: {
+        type: String,
+        required: false,
+        trim: true,
+      },
+      normalized: {
+        type: String,
+        required: false,
+        trim: true,
+      },
     }],
   },
   {
@@ -48,3 +57,28 @@ export const FinancialSpreadingAliasSchema = new mongoose.Schema<IFinancialSprea
 );
 
 export const FinancialSpreadingAlias = mongoose.model<IFinancialSpreadingAlias, TFinancialSpreadingAliasModel>(MODEL_NAMES.financialSpreadingAlias, FinancialSpreadingAliasSchema);
+
+FinancialSpreadingAliasSchema.index({
+  'aliases.normalized': 1,
+});
+
+FinancialSpreadingAliasSchema.pre('validate', function(next) {
+  this.aliases = this.aliases
+    .filter(a => a.original?.trim())
+    .map(a => ({
+      original: a.original.trim(),
+      normalized: normalizeAlias(a.original),
+    }));
+
+  next();
+});
+
+export function normalizeAlias(input: string): string {
+  return input
+    .toLowerCase()
+    .replace(/[–—−]/g, '-')
+    .replace(/[_]/g, ' ')
+    .replace(/[^\p{L}\p{N}\s-]/gu, '')
+    .replace(/\s+/g, ' ')
+    .trim();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemcap-be-common",
-  "version": "1.4.113",
+  "version": "1.4.115",
   "description": "",
   "main": "index.js",
   "scripts": {