@intelact/driveup 1.5.2 → 1.5.3

package/lib/driving/lesson/topic.dto.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrivingTopicFilterDto = exports.CompanyTopicSubmitDto = void 0;
+const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
-const types_1 = require("../../types");
-const utils_1 = require("../../utils");
+const types_1 = require("./types");
 class CompanyTopicSubmitDto {
     title;
     description;
@@ -21,13 +21,13 @@ class CompanyTopicSubmitDto {
 exports.CompanyTopicSubmitDto = CompanyTopicSubmitDto;
 __decorate([
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value.trim()),
     (0, class_validator_1.IsNotEmpty)(),
     __metadata("design:type", String)
 ], CompanyTopicSubmitDto.prototype, "title", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], CompanyTopicSubmitDto.prototype, "description", void 0);
@@ -36,7 +36,8 @@ __decorate([
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.ArrayNotEmpty)(),
     (0, class_validator_1.IsString)({ each: true }),
-    (0, utils_1.ToStringArray)(),
+    (0, class_transformer_1.Transform)(({ value }) => (Array.isArray(value) ? value : [value])) // Transform single value into an array to allow sending one skill from form-data
+    ,
     __metadata("design:type", Array)
 ], CompanyTopicSubmitDto.prototype, "skills", void 0);
 class DrivingTopicFilterDto {
@@ -46,13 +47,13 @@ class DrivingTopicFilterDto {
 exports.DrivingTopicFilterDto = DrivingTopicFilterDto;
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.IsEnum)(types_1.StatusType),
+    (0, class_validator_1.IsEnum)(types_1.DrivingTopicStatus),
     __metadata("design:type", String)
 ], DrivingTopicFilterDto.prototype, "status", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     __metadata("design:type", String)
 ], DrivingTopicFilterDto.prototype, "title", void 0);
 //# sourceMappingURL=topic.dto.js.map

package/lib/driving/lesson/topic.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"topic.dto.js","sourceRoot":"","sources":["../../../src/driving/lesson/topic.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAmG;AACnG,uCAAyC;AACzC,uCAAkD;AAElD,MAAa,qBAAqB;IAIjC,KAAK,CAAS;IAKd,WAAW,CAAS;IAOpB,MAAM,CAAW;CACjB;AAjBD,sDAiBC;AAbA;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,YAAI,GAAE;IACN,IAAA,4BAAU,GAAE;;oDACC;AAKd;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,YAAI,GAAE;IACN,IAAA,0BAAQ,GAAE;;0DACS;AAOpB;IALC,IAAA,4BAAU,GAAE;IACT,IAAA,yBAAO,GAAE;IACT,IAAA,+BAAa,GAAE;IACf,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,qBAAa,GAAE;;qDACC;AAGlB,MAAa,qBAAqB;IAGjC,MAAM,CAAa;IAKnB,KAAK,CAAS;CACd;AATD,sDASC;AANA;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,EAAC,kBAAU,CAAC;;qDACA;AAKnB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,YAAI,GAAE;;oDACO"}
+{"version":3,"file":"topic.dto.js","sourceRoot":"","sources":["../../../src/driving/lesson/topic.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAoD;AACpD,qDAA6G;AAC7G,mCAA6C;AAE7C,MAAa,qBAAqB;IAIjC,KAAK,CAAS;IAKd,WAAW,CAAS;IAOpB,MAAM,CAAW;CACjB;AAjBD,sDAiBC;AAbA;IAHC,IAAA,0BAAQ,GAAE;IACV,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IACtC,IAAA,4BAAU,GAAE;;oDACC;AAKd;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;IACvC,IAAA,0BAAQ,GAAE;;0DACS;AAOpB;IALC,IAAA,4BAAU,GAAE;IACT,IAAA,yBAAO,GAAE;IACT,IAAA,+BAAa,GAAE;IACf,IAAA,0BAAQ,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,iFAAiF;;;qDACpI;AAGlB,MAAa,qBAAqB;IAGjC,MAAM,CAAqB;IAK3B,KAAK,CAAS;CACd;AATD,sDASC;AANA;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,EAAC,0BAAkB,CAAC;;qDACA;AAK3B;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;;oDAC1B"}

package/lib/event/event.dto.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskFilterDto = exports.TaskUpdateDto = exports.TaskCreateDto = void 0;
+const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
-const utils_1 = require("../utils");
-const utils_2 = require("../utils");
+const validators_1 = require("../validators");
 class TaskCreateDto {
     instructorId;
     title;
@@ -30,14 +30,14 @@ __decorate([
 ], TaskCreateDto.prototype, "instructorId", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
-    (0, utils_2.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], TaskCreateDto.prototype, "title", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     (0, class_validator_1.IsDate)(),
-    (0, class_validator_1.Validate)(utils_1.CompareWithEndDate),
+    (0, class_validator_1.Validate)(validators_1.CompareWithEndDate),
     __metadata("design:type", Date)
 ], TaskCreateDto.prototype, "startDate", void 0);
 __decorate([
@@ -71,14 +71,14 @@ __decorate([
 ], TaskUpdateDto.prototype, "instructorId", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
-    (0, utils_2.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], TaskUpdateDto.prototype, "title", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     (0, class_validator_1.IsDate)(),
-    (0, class_validator_1.Validate)(utils_1.CompareWithEndDate),
+    (0, class_validator_1.Validate)(validators_1.CompareWithEndDate),
     __metadata("design:type", Date)
 ], TaskUpdateDto.prototype, "startDate", void 0);
 __decorate([
@@ -107,21 +107,25 @@ class TaskFilterDto {
 exports.TaskFilterDto = TaskFilterDto;
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, utils_2.ToNumberArray)(),
+    (0, class_transformer_1.Transform)(({ value }) => value
+        ? Array.isArray(value)
+            ? value.map(v => +v)
+            : [+value]
+        : undefined),
     (0, class_validator_1.IsArray)(),
     (0, class_validator_1.IsNumber)({}, { each: true }),
     __metadata("design:type", Array)
 ], TaskFilterDto.prototype, "instructors", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, utils_2.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], TaskFilterDto.prototype, "title", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     (0, class_validator_1.IsDate)(),
-    (0, class_validator_1.Validate)(utils_1.CompareWithEndDate),
+    (0, class_validator_1.Validate)(validators_1.CompareWithEndDate),
     __metadata("design:type", Date)
 ], TaskFilterDto.prototype, "startDate", void 0);
 __decorate([

package/lib/event/event.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.dto.js","sourceRoot":"","sources":["../../src/event/event.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAwH;AACxH,oCAA8C;AAC9C,oCAA+C;AAE/C,MAAa,aAAa;IAIzB,YAAY,CAAS;IAKrB,KAAK,CAAS;IAKd,SAAS,CAAO;IAIhB,OAAO,CAAO;IAId,MAAM,CAAU;IAIhB,IAAI,CAAU;CACd;AA3BD,sCA2BC;AAvBA;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;IACV,IAAA,qBAAG,EAAC,CAAC,CAAC;;mDACc;AAKrB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,YAAI,GAAE;IACN,IAAA,0BAAQ,GAAE;;4CACG;AAKd;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,0BAAkB,CAAC;8BAClB,IAAI;gDAAC;AAIhB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;8BACA,IAAI;8CAAC;AAId;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;;6CACI;AAIhB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;;2CACE;AAGf,MAAa,aAAa;IAGzB,YAAY,CAAS;IAKrB,KAAK,CAAS;IAKd,SAAS,CAAO;IAIhB,OAAO,CAAO;IAId,MAAM,CAAU;IAIhB,IAAI,CAAU;CACd;AA1BD,sCA0BC;AAvBA;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,0BAAQ,GAAE;;mDACU;AAKrB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,YAAI,GAAE;IACN,IAAA,0BAAQ,GAAE;;4CACG;AAKd;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,0BAAkB,CAAC;8BAClB,IAAI;gDAAC;AAIhB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;8BACA,IAAI;8CAAC;AAId;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;;6CACI;AAIhB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;;2CACE;AAGf,MAAa,aAAa;IAKzB,WAAW,CAAW;IAKtB,KAAK,CAAS;IAKd,SAAS,CAAO;IAIhB,OAAO,CAAO;IAId,MAAM,CAAU;IAIhB,IAAI,CAAU;CACd;AA5BD,sCA4BC;AAvBA;IAJC,IAAA,4BAAU,GAAE;IACZ,IAAA,qBAAa,GAAE;IACf,IAAA,yBAAO,GAAE;IACT,IAAA,0BAAQ,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;kDACP;AAKtB;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,YAAI,GAAE;IACN,IAAA,0BAAQ,GAAE;;4CACG;AAKd;IAHC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;IACR,IAAA,0BAAQ,EAAC,0BAAkB,CAAC;8BAClB,IAAI;gDAAC;AAIhB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAM,GAAE;8BACA,IAAI;8CAAC;AAId;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;;6CACI;AAIhB;IAFC,IAAA,4BAAU,GAAE;IACZ,IAAA,2BAAS,GAAE;;2CACE"}
+{"version":3,"file":"event.dto.js","sourceRoot":"","sources":["../../src/event/event.dto.ts"],"names":[],"mappings":"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"}

package/lib/expense/category.model.d.ts

@@ -1,4 +1,4 @@
-import { Language } from "../types";
+import { Language } from "../common/language";
 export declare class ExpenseCategory {
     id: number;
     name: string;

package/lib/expense/category.model.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpenseCategoryTranslation = exports.ExpenseCategory = void 0;
 const class_transformer_1 = require("class-transformer");
-const types_1 = require("../types");
+const language_1 = require("../common/language");
 class ExpenseCategory {
     id;
     name;

package/lib/expense/category.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"category.model.js","sourceRoot":"","sources":["../../src/expense/category.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,oCAAoC;AAEpC,MAAa,eAAe;IAI3B,EAAE,CAAS;IAGX,IAAI,CAAS;IAGb,KAAK,CAAS;IAGd,WAAW,CAAS;IAGpB,IAAI,CAAS;IAEb,kEAAkE;IAGlE,YAAY,CAA8B;IAE1C,YAAY,KAAgC;QAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD;AA1BD,0CA0BC;AAtBA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;2CACR;AAGX;IADC,IAAA,0BAAM,GAAE;;6CACI;AAGb;IADC,IAAA,0BAAM,GAAE;;8CACK;AAGd;IADC,IAAA,0BAAM,GAAE;;oDACW;AAGpB;IADC,IAAA,0BAAM,GAAE;;6CACI;AAKb;IADC,IAAA,0BAAM,GAAE;;qDACiC;AAO3C,MAAa,0BAA0B;IAItC,EAAE,CAAS;IAGX,QAAQ,CAAW;IAGnB,KAAK,CAAS;IAGd,WAAW,CAAS;IAEpB,YAAY,KAA2C;QACtD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD;AAlBD,gEAkBC;AAdA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;sDACR;AAGX;IADC,IAAA,0BAAM,GAAE;;4DACU;AAGnB;IADC,IAAA,0BAAM,GAAE;;yDACK;AAGd;IADC,IAAA,0BAAM,GAAE;;+DACW"}
+{"version":3,"file":"category.model.js","sourceRoot":"","sources":["../../src/expense/category.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,iDAA8C;AAE9C,MAAa,eAAe;IAI3B,EAAE,CAAS;IAGX,IAAI,CAAS;IAGb,KAAK,CAAS;IAGd,WAAW,CAAS;IAGpB,IAAI,CAAS;IAEb,kEAAkE;IAGlE,YAAY,CAA8B;IAE1C,YAAY,KAAgC;QAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD;AA1BD,0CA0BC;AAtBA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;2CACR;AAGX;IADC,IAAA,0BAAM,GAAE;;6CACI;AAGb;IADC,IAAA,0BAAM,GAAE;;8CACK;AAGd;IADC,IAAA,0BAAM,GAAE;;oDACW;AAGpB;IADC,IAAA,0BAAM,GAAE;;6CACI;AAKb;IADC,IAAA,0BAAM,GAAE;;qDACiC;AAO3C,MAAa,0BAA0B;IAItC,EAAE,CAAS;IAGX,QAAQ,CAAW;IAGnB,KAAK,CAAS;IAGd,WAAW,CAAS;IAEpB,YAAY,KAA2C;QACtD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD;AAlBD,gEAkBC;AAdA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;sDACR;AAGX;IADC,IAAA,0BAAM,GAAE;;4DACU;AAGnB;IADC,IAAA,0BAAM,GAAE;;yDACK;AAGd;IADC,IAAA,0BAAM,GAAE;;+DACW"}

package/lib/expense/expense.dto.d.ts

@@ -1,4 +1,5 @@
-import { Language, StatusType } from "../types";
+import { Language } from "../common/language";
+import { FinanceStatus } from "../finance";
 export declare class ExpenseCreateDto {
     amount: number;
     categoryId: number;
@@ -15,7 +16,7 @@ export declare class CompanyExpenseFilterDto {
     endDate: Date;
     categories: number[];
     instructorId: number;
-    statuses: StatusType[];
+    statuses: FinanceStatus[];
     phrase: string;
     sortLogic: 'createdBy' | 'createdOn' | 'category' | 'amount' | 'status';
     sortOrder: 'asc' | 'desc';

package/lib/expense/expense.dto.js

@@ -10,10 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemExpenseTranslationDto = exports.CompanyExpenseFilterDto = exports.ExpenseUpdateDto = exports.ExpenseCreateDto = void 0;
+const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
-const types_1 = require("../types");
-const compare_validator_1 = require("../utils/compare.validator");
-const utils_1 = require("../utils");
+const language_1 = require("../common/language");
+const compare_validator_1 = require("../validators/compare.validator");
+const finance_1 = require("../finance");
 class ExpenseCreateDto {
     amount;
     categoryId;
@@ -35,7 +36,7 @@ __decorate([
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     __metadata("design:type", String)
 ], ExpenseCreateDto.prototype, "description", void 0);
 class ExpenseUpdateDto {
@@ -60,7 +61,7 @@ __decorate([
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     __metadata("design:type", String)
 ], ExpenseUpdateDto.prototype, "description", void 0);
 __decorate([
@@ -81,40 +82,54 @@ class CompanyExpenseFilterDto {
 exports.CompanyExpenseFilterDto = CompanyExpenseFilterDto;
 __decorate([
     (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Transform)(({ value }) => value ? new Date(value) : null),
     (0, class_validator_1.IsDate)(),
     (0, class_validator_1.Validate)(compare_validator_1.CompareWithEndDate),
     __metadata("design:type", Date)
 ], CompanyExpenseFilterDto.prototype, "startDate", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Transform)(({ value }) => value ? new Date(value) : null),
     (0, class_validator_1.IsDate)(),
     __metadata("design:type", Date)
 ], CompanyExpenseFilterDto.prototype, "endDate", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, utils_1.ToNumberArray)(),
+    (0, class_transformer_1.Transform)(({ value }) => value ?
+        Array.isArray(value) ?
+            value.map(v => +v)
+            : [+value]
+        : undefined),
     (0, class_validator_1.IsNumber)({}, { each: true }),
     (0, class_validator_1.Min)(1, { each: true }),
     __metadata("design:type", Array)
 ], CompanyExpenseFilterDto.prototype, "categories", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, utils_1.ToNumber)(),
+    (0, class_transformer_1.Transform)(({ value }) => value ? +value : null),
     (0, class_validator_1.IsNumber)(),
     (0, class_validator_1.Min)(1),
     __metadata("design:type", Number)
 ], CompanyExpenseFilterDto.prototype, "instructorId", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, utils_1.ToEnumArray)(types_1.StatusType),
-    (0, class_validator_1.IsEnum)(types_1.StatusType, { each: true }),
-    (0, class_validator_1.IsIn)([types_1.StatusType.Pending, types_1.StatusType.Approved, types_1.StatusType.Rejected], { each: true }),
+    (0, class_transformer_1.Transform)(({ value }) => {
+        if (value === '') {
+            value = undefined;
+        }
+        else if (value && !Array.isArray(value)) {
+            value = [value];
+        }
+        return value;
+    }),
+    (0, class_validator_1.IsEnum)(finance_1.FinanceStatus, { each: true }),
+    (0, class_validator_1.IsIn)([finance_1.FinanceStatus.Pending, finance_1.FinanceStatus.Approved, finance_1.FinanceStatus.Rejected], { each: true }),
     __metadata("design:type", Array)
 ], CompanyExpenseFilterDto.prototype, "statuses", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     __metadata("design:type", String)
 ], CompanyExpenseFilterDto.prototype, "phrase", void 0);
 __decorate([
@@ -141,19 +156,19 @@ __decorate([
 ], SystemExpenseTranslationDto.prototype, "id", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
-    (0, class_validator_1.IsEnum)(types_1.Language),
+    (0, class_validator_1.IsEnum)(language_1.Language),
     __metadata("design:type", String)
 ], SystemExpenseTranslationDto.prototype, "language", void 0);
 __decorate([
     (0, class_validator_1.IsNotEmpty)(),
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     __metadata("design:type", String)
 ], SystemExpenseTranslationDto.prototype, "title", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)(),
-    (0, utils_1.Trim)(),
+    (0, class_transformer_1.Transform)(({ value }) => value?.trim()),
     __metadata("design:type", String)
 ], SystemExpenseTranslationDto.prototype, "description", void 0);
 //# sourceMappingURL=expense.dto.js.map

package/lib/expense/expense.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"expense.dto.js","sourceRoot":"","sources":["../../src/expense/expense.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expense.dto.js","sourceRoot":"","sources":["../../src/expense/expense.dto.ts"],"names":[],"mappings":"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"}

package/lib/expense/expense.model.d.ts

@@ -1,9 +1,9 @@
 import { ExpenseCategory } from "./category.model";
 import { Instructor } from "../instructor/instructor.model";
-import { StatusType } from "../types";
+import { FinanceStatus } from "../finance";
 export declare class Expense {
     id: number;
-    status: StatusType;
+    status: FinanceStatus;
     category: ExpenseCategory;
     amount: number;
     description: string;

package/lib/expense/expense.model.js

@@ -13,7 +13,7 @@ exports.Expense = void 0;
 const class_transformer_1 = require("class-transformer");
 const category_model_1 = require("./category.model");
 const instructor_model_1 = require("../instructor/instructor.model");
-const types_1 = require("../types");
+const finance_1 = require("../finance");
 class Expense {
     id;
     status;

package/lib/expense/expense.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"expense.model.js","sourceRoot":"","sources":["../../src/expense/expense.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,qDAAmD;AACnD,qEAA4D;AAC5D,oCAAsC;AAEtC,MAAa,OAAO;IAInB,EAAE,CAAS;IAGX,MAAM,CAAa;IAInB,QAAQ,CAAkB;IAI1B,MAAM,CAAS;IAGf,WAAW,CAAS;IAGpB,UAAU,CAAS;IAInB,SAAS,CAAa;IAItB,SAAS,CAAO;IAIhB,UAAU,CAAa;IAIvB,UAAU,CAAO;IAIjB,UAAU,CAAa;IAIvB,UAAU,CAAO;IAIjB,UAAU,CAAa;IAIvB,UAAU,CAAO;IAEjB,YAAY,KAAwB;QACnC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD;AA1DD,0BA0DC;AAtDA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;mCACR;AAGX;IADC,IAAA,0BAAM,GAAE;;uCACU;AAInB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,gCAAe,CAAC;8BAClB,gCAAe;yCAAC;AAI1B;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;uCACJ;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACW;AAGpB;IADC,IAAA,0BAAM,GAAE;;2CACU;AAInB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACZ,6BAAU;0CAAC;AAItB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACN,IAAI;0CAAC;AAIhB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACX,6BAAU;2CAAC;AAIvB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACL,IAAI;2CAAC;AAIjB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACX,6BAAU;2CAAC;AAIvB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACL,IAAI;2CAAC;AAIjB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACX,6BAAU;2CAAC;AAIvB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACL,IAAI;2CAAC"}
+{"version":3,"file":"expense.model.js","sourceRoot":"","sources":["../../src/expense/expense.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAiD;AACjD,qDAAmD;AACnD,qEAA4D;AAC5D,wCAA2C;AAE3C,MAAa,OAAO;IAInB,EAAE,CAAS;IAGX,MAAM,CAAgB;IAItB,QAAQ,CAAkB;IAI1B,MAAM,CAAS;IAGf,WAAW,CAAS;IAGpB,UAAU,CAAS;IAInB,SAAS,CAAa;IAItB,SAAS,CAAO;IAIhB,UAAU,CAAa;IAIvB,UAAU,CAAO;IAIjB,UAAU,CAAa;IAIvB,UAAU,CAAO;IAIjB,UAAU,CAAa;IAIvB,UAAU,CAAO;IAEjB,YAAY,KAAwB;QACnC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;CACD;AA1DD,0BA0DC;AAtDA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;mCACR;AAGX;IADC,IAAA,0BAAM,GAAE;;uCACa;AAItB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,gCAAe,CAAC;8BAClB,gCAAe;yCAAC;AAI1B;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;uCACJ;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACW;AAGpB;IADC,IAAA,0BAAM,GAAE;;2CACU;AAInB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACZ,6BAAU;0CAAC;AAItB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACN,IAAI;0CAAC;AAIhB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACX,6BAAU;2CAAC;AAIvB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACL,IAAI;2CAAC;AAIjB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACX,6BAAU;2CAAC;AAIvB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACL,IAAI;2CAAC;AAIjB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,6BAAU,CAAC;8BACX,6BAAU;2CAAC;AAIvB;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACL,IAAI;2CAAC"}

package/lib/expense/index.d.ts

@@ -1,3 +1,4 @@
 export * from './category.model';
 export * from './expense.dto';
 export * from './expense.model';
+export * from './expense.types';

package/lib/expense/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./category.model"), exports);
 __exportStar(require("./expense.dto"), exports);
 __exportStar(require("./expense.model"), exports);
+__exportStar(require("./expense.types"), exports);
 //# sourceMappingURL=index.js.map

package/lib/expense/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/expense/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,gDAA8B;AAC9B,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/expense/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,gDAA8B;AAC9B,kDAAgC;AAChC,kDAAgC"}

package/lib/finance/finance.dto.d.ts

@@ -1,4 +1,6 @@
-import { PaymentType, StatusType, TransactionType, TrainingType } from "../types";
+import { FinanceStatus, FinanceType } from "./finance.type";
+import { PaymentType } from "../payment/payment.types";
+import { TrainingStatus, TrainingType } from "../training/training.types";
 export declare class CompanyBankInfoSubmitDto {
     IBAN: string;
     taxId: string;
@@ -7,16 +9,16 @@ export declare class CompanyFinancialFlowFilterDto {
     startDate: Date;
     endDate: Date;
     registeredBy: number;
-    financeTypes: TransactionType[];
+    financeTypes: FinanceType[];
     paymentTypes: PaymentType[];
     trainingTypes: TrainingType[];
-    statuses: StatusType[];
+    statuses: FinanceStatus[];
     phrase: string;
     sortLogic: 'financeType' | 'studentName' | 'createdOn' | 'amount' | 'status';
     sortOrder: 'asc' | 'desc';
 }
 export declare class FinanceFilterDto {
-    types: TransactionType[];
+    types: FinanceType[];
     startDate: Date;
     endDate: Date;
     sortLogic: 'createdOn' | 'type' | 'amount' | 'registeredBy';
@@ -29,7 +31,7 @@ export declare class FinanceSortDto {
 export declare class CompanyStudentDebtFilterDto {
     trainingTypes: TrainingType[];
     categories: number[];
-    statuses: StatusType[];
+    statuses: TrainingStatus[];
     /** Only load debts more than this value */
     minDebt: number;
     phrase: string;
@@ -37,10 +39,10 @@ export declare class CompanyStudentDebtFilterDto {
     sortOrder: 'asc' | 'desc';
 }
 export declare class HandoverTransactionStatusDto {
-    status: StatusType;
+    status: FinanceStatus;
 }
 export declare class CompanyOnlineTransactionFilterDto {
-    statuses: StatusType[];
+    statuses: FinanceStatus[];
     startDate: Date;
     endDate: Date;
     phrase: string;