diff --git a/dist/Admin/index.d.ts b/dist/Admin/index.d.ts index 2a8f69c..20b6538 100644 --- a/dist/Admin/index.d.ts +++ b/dist/Admin/index.d.ts @@ -1,4 +1,4 @@ -import User from "./User"; +import User from "../Notary/User"; export default User; export { default as Address } from "../SuperAdmin/Address"; export { default as Customer } from "./Customer"; diff --git a/dist/Admin/index.js b/dist/Admin/index.js index b0275fd..434a6c1 100644 --- a/dist/Admin/index.js +++ b/dist/Admin/index.js @@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.OfficeRole = exports.Role = exports.Rule = exports.OfficeFolderAnchor = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedType = exports.Deed = exports.Contact = exports.Customer = exports.Address = void 0; -const User_1 = __importDefault(require("./User")); +const User_1 = __importDefault(require("../Notary/User")); exports.default = User_1.default; var Address_1 = require("../SuperAdmin/Address"); Object.defineProperty(exports, "Address", { enumerable: true, get: function () { return __importDefault(Address_1).default; } }); diff --git a/dist/Customer/OfficeFolder.d.ts b/dist/Customer/OfficeFolder.d.ts index 1e5364c..f8e8cb6 100644 --- a/dist/Customer/OfficeFolder.d.ts +++ b/dist/Customer/OfficeFolder.d.ts @@ -1,6 +1,7 @@ import Office from "./Office"; import Resource from "../Resource"; import EFolderStatus from "./EFolderStatus"; +import Customer from "./Customer"; export default class OfficeFolder extends Resource { uid?: string; folder_number: string; @@ -9,6 +10,7 @@ export default class OfficeFolder extends Resource { archived_description: string | null; status: EFolderStatus | string; office?: Office; + customers?: Customer[]; created_at: Date | null; updated_at: Date | null; } diff --git a/dist/Customer/OfficeFolder.js b/dist/Customer/OfficeFolder.js index 8992935..185ab82 100644 --- a/dist/Customer/OfficeFolder.js +++ b/dist/Customer/OfficeFolder.js @@ -17,6 +17,7 @@ const Office_1 = __importDefault(require("./Office")); const Resource_1 = __importDefault(require("../Resource")); const class_transformer_1 = require("class-transformer"); const EFolderStatus_1 = __importDefault(require("./EFolderStatus")); +const Customer_1 = __importDefault(require("./Customer")); class OfficeFolder extends Resource_1.default { constructor() { super(...arguments); @@ -56,6 +57,11 @@ __decorate([ (0, class_transformer_1.Type)(() => Office_1.default), __metadata("design:type", Office_1.default) ], OfficeFolder.prototype, "office", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + (0, class_transformer_1.Type)(() => Customer_1.default), + __metadata("design:type", Array) +], OfficeFolder.prototype, "customers", void 0); __decorate([ (0, class_transformer_1.Expose)(), (0, class_validator_1.IsDate)(), diff --git a/dist/SuperAdmin/User.d.ts b/dist/SuperAdmin/User.d.ts index e1bb50f..c47c2e7 100644 --- a/dist/SuperAdmin/User.d.ts +++ b/dist/SuperAdmin/User.d.ts @@ -1,5 +1,5 @@ -export * from "../Admin/User"; -import UserAdmin from "../Admin/User"; +export * from "../Admin"; +import UserAdmin from "../Admin"; import Vote from "./Vote"; import Appointment from "./Appointment"; export default class User extends UserAdmin { diff --git a/dist/SuperAdmin/User.js b/dist/SuperAdmin/User.js index dea75fc..1879b0f 100644 --- a/dist/SuperAdmin/User.js +++ b/dist/SuperAdmin/User.js @@ -26,12 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("../Admin/User"), exports); +__exportStar(require("../Admin"), exports); const class_transformer_1 = require("class-transformer"); -const User_1 = __importDefault(require("../Admin/User")); +const Admin_1 = __importDefault(require("../Admin")); const Vote_1 = __importDefault(require("./Vote")); const Appointment_1 = __importDefault(require("./Appointment")); -class User extends User_1.default { +class User extends Admin_1.default { } __decorate([ (0, class_transformer_1.Expose)(), diff --git a/src/Admin/User.ts b/src/Admin/User.ts deleted file mode 100644 index 90d9f84..0000000 --- a/src/Admin/User.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from "../Notary/User"; -import User from "../Notary/User"; - -export default User; \ No newline at end of file diff --git a/src/Admin/index.ts b/src/Admin/index.ts index 34ade77..c5753fe 100644 --- a/src/Admin/index.ts +++ b/src/Admin/index.ts @@ -1,4 +1,4 @@ -import User from "./User"; +import User from "../Notary/User"; export default User; export {default as Address} from "../SuperAdmin/Address"; diff --git a/src/Customer/OfficeFolder.ts b/src/Customer/OfficeFolder.ts index b35f965..5920bf8 100644 --- a/src/Customer/OfficeFolder.ts +++ b/src/Customer/OfficeFolder.ts @@ -5,6 +5,7 @@ import Office from "./Office"; import Resource from "../Resource"; import { Expose, Type } from "class-transformer"; import EFolderStatus from "./EFolderStatus"; +import Customer from "./Customer"; export default class OfficeFolder extends Resource { @Expose() @@ -29,6 +30,10 @@ export default class OfficeFolder extends Resource { @Type(() => Office) public office?: Office; + @Expose() + @Type(() => Customer) + public customers?: Customer[]; + @Expose() @IsDate() public created_at: Date | null = null; diff --git a/src/Notary/OfficeFolder.ts b/src/Notary/OfficeFolder.ts index 8891b42..397cf43 100644 --- a/src/Notary/OfficeFolder.ts +++ b/src/Notary/OfficeFolder.ts @@ -62,7 +62,7 @@ export default class OfficeFolder extends OfficeFolderCustomer { @IsOptional({ groups: ["updateFolder"] }) @ValidateNested({ groups: ["updateFolder"] }) @Type(() => Customer) - customers?: Customer[]; + public override customers?: Customer[]; @Expose() @IsOptional({ groups: ["updateFolder"] }) diff --git a/src/SuperAdmin/User.ts b/src/SuperAdmin/User.ts index 9ca9c93..53ae0ad 100644 --- a/src/SuperAdmin/User.ts +++ b/src/SuperAdmin/User.ts @@ -1,6 +1,6 @@ -export * from "../Admin/User"; +export * from "../Admin"; import { Expose, Type } from "class-transformer"; -import UserAdmin from "../Admin/User"; +import UserAdmin from "../Admin"; import Vote from "./Vote"; import Appointment from "./Appointment";