echadospalante-core 13.1.0 → 14.0.0

package/dist/app/modules/infrastructure/database/entities/venture-event.data.js

@@ -13,16 +13,16 @@ exports.VentureEventData = void 0;
 const typeorm_1 = require("typeorm");
 const event_location_data_1 = require("./event-location.data");
 const event_donation_data_1 = require("./event-donation.data");
-const venture_detail_data_1 = require("./venture-detail.data");
 const event_category_data_1 = require("./event-category.data");
 const event_contact_data_1 = require("./event-contact.data");
+const venture_data_1 = require("./venture.data");
 let VentureEventData = class VentureEventData {
     id;
     title;
     description;
     coverPhoto;
     slug;
-    ventureDetail;
+    venture;
     location;
     contact;
     categories;
@@ -54,10 +54,10 @@ __decorate([
     __metadata("design:type", String)
 ], VentureEventData.prototype, "slug", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => venture_detail_data_1.VentureDetailData, (ventureDetail) => ventureDetail.events),
+    (0, typeorm_1.ManyToOne)(() => venture_data_1.VentureData, (venture) => venture.events),
     (0, typeorm_1.JoinColumn)({ name: "ventureId" }),
-    __metadata("design:type", venture_detail_data_1.VentureDetailData)
-], VentureEventData.prototype, "ventureDetail", void 0);
+    __metadata("design:type", venture_data_1.VentureData)
+], VentureEventData.prototype, "venture", void 0);
 __decorate([
     (0, typeorm_1.JoinColumn)({ name: "locationId" }),
     (0, typeorm_1.OneToOne)(() => event_location_data_1.EventLocationData, (eventLocation) => eventLocation.event, {

package/dist/app/modules/infrastructure/database/entities/venture-publication.data.d.ts

@@ -1,8 +1,8 @@
 import { PublicationClapData } from "./publication-clap.data";
 import { PublicationCommentData } from "./publication-comment.data";
-import { VentureDetailData } from "./venture-detail.data";
 import { PublicationContentData } from "./publication-content.data";
 import { PublicationType } from "../../../domain/publications";
+import { VentureData } from "./venture.data";
 export declare class VenturePublicationData {
     id: string;
     description: string;
@@ -10,8 +10,7 @@ export declare class VenturePublicationData {
     clapsCount: number;
     createdAt: Date;
     updatedAt: Date;
-    detailId: string;
-    detail: VentureDetailData;
+    venture: VentureData;
     claps: PublicationClapData[];
     comments: PublicationCommentData[];
     contents: PublicationContentData[];

package/dist/app/modules/infrastructure/database/entities/venture-publication.data.js

@@ -13,9 +13,9 @@ exports.VenturePublicationData = void 0;
 const typeorm_1 = require("typeorm");
 const publication_clap_data_1 = require("./publication-clap.data");
 const publication_comment_data_1 = require("./publication-comment.data");
-const venture_detail_data_1 = require("./venture-detail.data");
 const publication_content_data_1 = require("./publication-content.data");
 const publications_1 = require("../../../domain/publications");
+const venture_data_1 = require("./venture.data");
 let VenturePublicationData = class VenturePublicationData {
     id;
     description;
@@ -23,8 +23,7 @@ let VenturePublicationData = class VenturePublicationData {
     clapsCount;
     createdAt;
     updatedAt;
-    detailId;
-    detail;
+    venture;
     claps;
     comments;
     contents;
@@ -55,14 +54,10 @@ __decorate([
     __metadata("design:type", Date)
 ], VenturePublicationData.prototype, "updatedAt", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
-    __metadata("design:type", String)
-], VenturePublicationData.prototype, "detailId", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => venture_detail_data_1.VentureDetailData, (ventureDetail) => ventureDetail.publications),
-    (0, typeorm_1.JoinColumn)({ name: "detailId" }),
-    __metadata("design:type", venture_detail_data_1.VentureDetailData)
-], VenturePublicationData.prototype, "detail", void 0);
+    (0, typeorm_1.ManyToOne)(() => venture_data_1.VentureData, (venture) => venture.publications),
+    (0, typeorm_1.JoinColumn)({ name: "ventureId" }),
+    __metadata("design:type", venture_data_1.VentureData)
+], VenturePublicationData.prototype, "venture", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(() => publication_clap_data_1.PublicationClapData, (publicationClap) => publicationClap.publication),
     __metadata("design:type", Array)

package/dist/app/modules/infrastructure/database/entities/venture-sponsorship.data.d.ts

@@ -1,10 +1,10 @@
-import { UserDetailData } from "./user-detail.data";
-import { VentureDetailData } from "./venture-detail.data";
+import { UserData } from "./user.data";
+import { VentureData } from "./venture.data";
 export declare class VentureSponsorshipData {
     id: string;
     monthlyAmount: number;
     createdAt: Date;
     updatedAt: Date;
-    sponsor?: UserDetailData;
-    detail?: VentureDetailData;
+    sponsor?: UserData;
+    venture?: VentureData;
 }

package/dist/app/modules/infrastructure/database/entities/venture-sponsorship.data.js

@@ -11,15 +11,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VentureSponsorshipData = void 0;
 const typeorm_1 = require("typeorm");
-const user_detail_data_1 = require("./user-detail.data");
-const venture_detail_data_1 = require("./venture-detail.data");
+const user_data_1 = require("./user.data");
+const venture_data_1 = require("./venture.data");
 let VentureSponsorshipData = class VentureSponsorshipData {
     id;
     monthlyAmount;
     createdAt;
     updatedAt;
     sponsor;
-    detail;
+    venture;
 };
 exports.VentureSponsorshipData = VentureSponsorshipData;
 __decorate([
@@ -39,15 +39,15 @@ __decorate([
     __metadata("design:type", Date)
 ], VentureSponsorshipData.prototype, "updatedAt", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => user_detail_data_1.UserDetailData, (userDetail) => userDetail.sponsorships),
-    (0, typeorm_1.JoinColumn)({ name: "sponsorDetailId" }),
-    __metadata("design:type", user_detail_data_1.UserDetailData)
+    (0, typeorm_1.ManyToOne)(() => user_data_1.UserData, (user) => user.sponsorships),
+    (0, typeorm_1.JoinColumn)({ name: "sponsorId" }),
+    __metadata("design:type", user_data_1.UserData)
 ], VentureSponsorshipData.prototype, "sponsor", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => venture_detail_data_1.VentureDetailData, (ventureDetail) => ventureDetail.sponsorships),
-    (0, typeorm_1.JoinColumn)({ name: "ventureDetailId" }),
-    __metadata("design:type", venture_detail_data_1.VentureDetailData)
-], VentureSponsorshipData.prototype, "detail", void 0);
+    (0, typeorm_1.ManyToOne)(() => venture_data_1.VentureData, (venture) => venture.sponsorships),
+    (0, typeorm_1.JoinColumn)({ name: "ventureId" }),
+    __metadata("design:type", venture_data_1.VentureData)
+], VentureSponsorshipData.prototype, "venture", void 0);
 exports.VentureSponsorshipData = VentureSponsorshipData = __decorate([
     (0, typeorm_1.Entity)({ name: "venture_sponsorship" })
 ], VentureSponsorshipData);

package/dist/app/modules/infrastructure/database/entities/venture-subscription.data.d.ts

@@ -1,8 +1,8 @@
-import { UserDetailData } from "./user-detail.data";
-import { VentureDetailData } from "./venture-detail.data";
+import { UserData } from "./user.data";
+import { VentureData } from "./venture.data";
 export declare class VentureSubscriptionData {
     id: string;
     createdAt: Date;
-    subscriber?: UserDetailData;
-    detail?: VentureDetailData;
+    subscriber?: UserData;
+    venture?: VentureData;
 }

package/dist/app/modules/infrastructure/database/entities/venture-subscription.data.js

@@ -11,13 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VentureSubscriptionData = void 0;
 const typeorm_1 = require("typeorm");
-const user_detail_data_1 = require("./user-detail.data");
-const venture_detail_data_1 = require("./venture-detail.data");
+const user_data_1 = require("./user.data");
+const venture_data_1 = require("./venture.data");
 let VentureSubscriptionData = class VentureSubscriptionData {
     id;
     createdAt;
     subscriber;
-    detail;
+    venture;
 };
 exports.VentureSubscriptionData = VentureSubscriptionData;
 __decorate([
@@ -29,15 +29,15 @@ __decorate([
     __metadata("design:type", Date)
 ], VentureSubscriptionData.prototype, "createdAt", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => user_detail_data_1.UserDetailData, (userDetail) => userDetail.subscriptions),
-    (0, typeorm_1.JoinColumn)({ name: "subscriberDetailId" }),
-    __metadata("design:type", user_detail_data_1.UserDetailData)
+    (0, typeorm_1.ManyToOne)(() => user_data_1.UserData, (user) => user.subscriptions),
+    (0, typeorm_1.JoinColumn)({ name: "subscriberId" }),
+    __metadata("design:type", user_data_1.UserData)
 ], VentureSubscriptionData.prototype, "subscriber", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => venture_detail_data_1.VentureDetailData, (ventureDetail) => ventureDetail.subscriptions),
+    (0, typeorm_1.ManyToOne)(() => venture_data_1.VentureData, (venture) => venture.subscriptions),
     (0, typeorm_1.JoinColumn)({ name: "ventureId" }),
-    __metadata("design:type", venture_detail_data_1.VentureDetailData)
-], VentureSubscriptionData.prototype, "detail", void 0);
+    __metadata("design:type", venture_data_1.VentureData)
+], VentureSubscriptionData.prototype, "venture", void 0);
 exports.VentureSubscriptionData = VentureSubscriptionData = __decorate([
     (0, typeorm_1.Entity)({ name: "venture_subscription" })
 ], VentureSubscriptionData);

package/dist/app/modules/infrastructure/database/entities/venture.data.d.ts

@@ -1,8 +1,11 @@
-import { VentureDetailData } from "./venture-detail.data";
-import { VentureLocationData } from "./venture-location.data";
-import { UserDetailData } from "./user-detail.data";
-import { VentureContactData } from "./venture-contact.data";
 import { VentureCategoryData } from "./venture-category.data";
+import { VentureContactData } from "./venture-contact.data";
+import { VentureEventData } from "./venture-event.data";
+import { VentureLocationData } from "./venture-location.data";
+import { VenturePublicationData } from "./venture-publication.data";
+import { VentureSponsorshipData } from "./venture-sponsorship.data";
+import { VentureSubscriptionData } from "./venture-subscription.data";
+import { UserData } from "./user.data";
 export declare class VentureData {
     id: string;
     name: string;
@@ -13,9 +16,12 @@ export declare class VentureData {
     verified: boolean;
     createdAt: Date;
     updatedAt: Date;
-    detail?: VentureDetailData;
     location?: VentureLocationData;
-    ownerDetail?: UserDetailData;
+    owner?: UserData;
     contact?: VentureContactData;
     categories: VentureCategoryData[];
+    events: VentureEventData[];
+    publications: VenturePublicationData[];
+    sponsorships: VentureSponsorshipData[];
+    subscriptions: VentureSubscriptionData[];
 }

package/dist/app/modules/infrastructure/database/entities/venture.data.js

@@ -11,11 +11,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VentureData = void 0;
 const typeorm_1 = require("typeorm");
-const venture_detail_data_1 = require("./venture-detail.data");
-const venture_location_data_1 = require("./venture-location.data");
-const user_detail_data_1 = require("./user-detail.data");
-const venture_contact_data_1 = require("./venture-contact.data");
 const venture_category_data_1 = require("./venture-category.data");
+const venture_contact_data_1 = require("./venture-contact.data");
+const venture_event_data_1 = require("./venture-event.data");
+const venture_location_data_1 = require("./venture-location.data");
+const venture_publication_data_1 = require("./venture-publication.data");
+const venture_sponsorship_data_1 = require("./venture-sponsorship.data");
+const venture_subscription_data_1 = require("./venture-subscription.data");
+const user_data_1 = require("./user.data");
 let VentureData = class VentureData {
     id;
     name;
@@ -26,11 +29,14 @@ let VentureData = class VentureData {
     verified;
     createdAt;
     updatedAt;
-    detail;
     location;
-    ownerDetail;
+    owner;
     contact;
     categories;
+    events;
+    publications;
+    sponsorships;
+    subscriptions;
 };
 exports.VentureData = VentureData;
 __decorate([
@@ -69,23 +75,16 @@ __decorate([
     (0, typeorm_1.UpdateDateColumn)(),
     __metadata("design:type", Date)
 ], VentureData.prototype, "updatedAt", void 0);
-__decorate([
-    (0, typeorm_1.OneToOne)(() => venture_detail_data_1.VentureDetailData, (ventureDetail) => ventureDetail.venture, {
-        cascade: true,
-    }),
-    (0, typeorm_1.JoinColumn)({ name: "detailId" }),
-    __metadata("design:type", venture_detail_data_1.VentureDetailData)
-], VentureData.prototype, "detail", void 0);
 __decorate([
     (0, typeorm_1.OneToOne)(() => venture_location_data_1.VentureLocationData, (ventureLocation) => ventureLocation.Venture, { cascade: true, eager: true }),
     (0, typeorm_1.JoinColumn)({ name: "locationId" }),
     __metadata("design:type", venture_location_data_1.VentureLocationData)
 ], VentureData.prototype, "location", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => user_detail_data_1.UserDetailData, (userDetail) => userDetail.ventures),
-    (0, typeorm_1.JoinColumn)({ name: "ownerDetailId" }),
-    __metadata("design:type", user_detail_data_1.UserDetailData)
-], VentureData.prototype, "ownerDetail", void 0);
+    (0, typeorm_1.ManyToOne)(() => user_data_1.UserData, (user) => user.ventures),
+    (0, typeorm_1.JoinColumn)({ name: "ownerId" }),
+    __metadata("design:type", user_data_1.UserData)
+], VentureData.prototype, "owner", void 0);
 __decorate([
     (0, typeorm_1.OneToOne)(() => venture_contact_data_1.VentureContactData, (ventureContact) => ventureContact.Venture, { cascade: true }),
     (0, typeorm_1.JoinColumn)({ name: "ventureContactId" }),
@@ -100,6 +99,22 @@ __decorate([
     }),
     __metadata("design:type", Array)
 ], VentureData.prototype, "categories", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => venture_event_data_1.VentureEventData, (ventureEvent) => ventureEvent.venture),
+    __metadata("design:type", Array)
+], VentureData.prototype, "events", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => venture_publication_data_1.VenturePublicationData, (venturePublication) => venturePublication.venture),
+    __metadata("design:type", Array)
+], VentureData.prototype, "publications", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => venture_sponsorship_data_1.VentureSponsorshipData, (ventureSponsorship) => ventureSponsorship.venture),
+    __metadata("design:type", Array)
+], VentureData.prototype, "sponsorships", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => venture_subscription_data_1.VentureSubscriptionData, (ventureSubscription) => ventureSubscription.venture),
+    __metadata("design:type", Array)
+], VentureData.prototype, "subscriptions", void 0);
 exports.VentureData = VentureData = __decorate([
     (0, typeorm_1.Entity)({ name: "venture" })
 ], VentureData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echadospalante-core",
-  "version": "13.1.0",
+  "version": "14.0.0",
   "description": "This package contains the core of the echadospalante project, it contains the domain entities, helpers, and other utilities that are shared between the different services.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/app/modules/domain/auth/index.ts

@@ -1,3 +1 @@
-export { User } from "../user/user";
-export { Role } from "../user/role";
 export { AccessTokenPayload } from "./token-payload";

package/src/app/modules/domain/common/geo.ts

@@ -7,7 +7,7 @@
 //   flag: string;
 // }
 
-import { UserDetail } from "../user";
+import { User } from "../user";
 
 // export interface Currency {
 //   id: number;
@@ -28,7 +28,7 @@ export interface Municipality {
   id: number;
   name: string;
   department: Department;
-  userDetails: UserDetail[];
+  users: User[];
   createdAt: Date;
   updatedAt: Date;
 }

package/src/app/modules/domain/contributions/donation.ts

@@ -1,12 +1,11 @@
-import { User } from "../auth";
 import { VentureEvent } from "../events/event";
-import { UserDetail } from "../user";
+import { User } from "../user";
 
 export interface EventDonation {
   id: string;
   amount: number;
   currency: string;
   createdAt: Date;
-  donor: UserDetail;
+  donor: User;
   event: VentureEvent;
 }

package/src/app/modules/domain/contributions/sponsor.ts

@@ -1,10 +1,10 @@
-import { UserDetail } from "../user";
-import { VentureDetail } from "../ventures";
+import { User } from "../user";
+import { Venture } from "../ventures";
 
 export interface VentureSponsorship {
   id: string;
-  sponsor?: UserDetail;
-  venture?: VentureDetail;
+  sponsor?: User;
+  venture?: Venture;
   monthlyAmount: number;
   createdAt: Date;
   updatedAt: Date;

package/src/app/modules/domain/events/event.ts

@@ -1,5 +1,5 @@
 import { EventDonation } from "../contributions";
-import { Venture, VentureDetail } from "../ventures";
+import { Venture } from "../ventures";
 import { EventCategory } from "./event-category";
 import { EventContact } from "./event-contact";
 import { EventLocation } from "./event-location";
@@ -10,7 +10,7 @@ export interface VentureEvent {
   slug: string;
   description: string;
   coverPhoto: string;
-  ventureDetail?: VentureDetail;
+  venture?: Venture;
   location: EventLocation;
   contact: EventContact;
   categories: EventCategory[];

package/src/app/modules/domain/notifications/notification.ts

@@ -1,9 +1,9 @@
-import { UserDetail } from "../user";
+import { User } from "../user";
 
 export interface Notification {
   id: string;
   title: string;
-  user: UserDetail;
+  user: User;
   type: NotificationType;
   status: NotificationStatus;
   description: string;

package/src/app/modules/domain/publications/clap.ts

@@ -1,10 +1,9 @@
-import { User } from "../auth";
-import { UserDetail } from "../user";
+import { User } from "../user";
 import { VenturePublication } from "./publication";
 
 export interface PublicationClap {
   id: string;
-  user: UserDetail;
+  user: User;
   publication: VenturePublication;
   createdAt: Date;
 }

package/src/app/modules/domain/publications/comment.ts

@@ -1,10 +1,9 @@
-import { User } from "../auth";
-import { UserDetail } from "../user";
+import { User } from "../user";
 import { VenturePublication } from "./publication";
 
 export interface PublicationComment {
   id: string;
-  author: UserDetail;
+  author: User;
   content: string;
   publication: VenturePublication;
   createdAt: Date;

package/src/app/modules/domain/publications/index.ts

@@ -1,8 +1,5 @@
-export { EventCategory } from "../events/event-category";
 export { PublicationClap } from "./clap";
 export { PublicationComment } from "./comment";
-export { VentureEvent } from "../events/event";
-export { EventLocation } from "../events/event-location";
 export {
   PublicationContent,
   PublicationType,

package/src/app/modules/domain/user/index.ts

@@ -1,4 +1,3 @@
 export { UserContact } from "./contact";
 export { Role, AppRole } from "./role";
 export { User, UserCreate } from "./user";
-export { UserDetail } from "./detail";

package/src/app/modules/domain/user/user.ts

@@ -1,6 +1,8 @@
-import { VentureCategory } from "../ventures";
+import { Municipality } from "../common";
+import { EventDonation, VentureSponsorship } from "../contributions";
+import { PublicationClap, PublicationComment } from "../publications";
+import { Venture, VentureCategory, VentureSubscription } from "../ventures";
 import { UserContact } from "./contact";
-import { UserDetail } from "./detail";
 import { Role } from "./role";
 
 export interface User {
@@ -11,11 +13,20 @@ export interface User {
   lastName: string;
   active: boolean;
   contact?: UserContact;
-  detail?: UserDetail;
   verified: boolean;
   onboardingCompleted: boolean;
   roles: Role[];
   preferences: VentureCategory[];
+  gender: "M" | "F" | "O";
+  birthDate: Date;
+  municipality?: Municipality;
+  comments: PublicationComment[];
+  donations: EventDonation[];
+  notifications: Notification[];
+  publicationClaps: PublicationClap[];
+  sponsorships: VentureSponsorship[];
+  subscriptions: VentureSubscription[];
+  ventures: Venture[];
   createdAt: Date;
   updatedAt: Date;
 }

package/src/app/modules/domain/ventures/category.ts

@@ -1,4 +1,4 @@
-import { User } from "../auth";
+import { User } from "../user";
 import { Venture } from "./venture";
 
 export interface VentureCategory {

package/src/app/modules/domain/ventures/index.ts

@@ -1,5 +1,4 @@
 export { VentureCategory } from "./category";
-export { VentureDetail } from "./detail";
 export { VentureSubscription } from "./subscription";
 export { Venture, VentureCreate, VentureUpdate } from "./venture";
 export { VentureCategoryCreate } from "./category";

package/src/app/modules/domain/ventures/subscription.ts

@@ -1,11 +1,9 @@
-import { User } from "../auth";
-import { UserDetail } from "../user";
-import { VentureDetail } from "./detail";
+import { User } from "../user";
 import { Venture } from "./venture";
 
 export interface VentureSubscription {
   id: string;
-  subscriber?: UserDetail;
-  venture?: VentureDetail;
+  subscriber?: User;
+  venture?: Venture;
   createdAt: Date;
 }

package/src/app/modules/domain/ventures/venture.ts

@@ -1,8 +1,11 @@
-import { UserDetail } from "../user";
+import { VentureSponsorship } from "../contributions";
+import { VentureEvent } from "../events";
+import { VenturePublication } from "../publications";
+import { User } from "../user";
 import { VentureCategory } from "./category";
 import { VentureContact } from "./contact";
-import { VentureDetail } from "./detail";
 import { VentureLocation } from "./location";
+import { VentureSubscription } from "./subscription";
 
 export interface Venture {
   id: string;
@@ -12,11 +15,14 @@ export interface Venture {
   description: string;
   active: boolean;
   verified: boolean;
-  detail?: VentureDetail;
-  ownerDetail?: UserDetail;
+  owner?: User;
   categories: VentureCategory[];
   contact?: VentureContact;
   location?: VentureLocation;
+  events: VentureEvent[];
+  sponsorships: VentureSponsorship[];
+  subscriptions: VentureSubscription[];
+  publications: VenturePublication[];
   createdAt: Date;
   updatedAt: Date;
 }

package/src/app/modules/infrastructure/database/entities/event-donation.data.ts

@@ -7,8 +7,8 @@ import {
   ManyToOne,
   JoinColumn,
 } from "typeorm";
-import { UserDetailData } from "./user-detail.data";
 import { VentureEventData } from "./venture-event.data";
+import { UserData } from "./user.data";
 
 @Entity({ name: "event_donation" })
 export class EventDonationData {
@@ -24,9 +24,9 @@ export class EventDonationData {
   @CreateDateColumn()
   createdAt: Date;
 
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.donations)
-  @JoinColumn({ name: "donorDetailId" })
-  donor: UserDetailData;
+  @ManyToOne(() => UserData, (user) => user.donations)
+  @JoinColumn({ name: "donorId" })
+  donor: UserData;
 
   @ManyToOne(() => VentureEventData, (ventureEvent) => ventureEvent.donations)
   @JoinColumn({ name: "eventId" })

package/src/app/modules/infrastructure/database/entities/index.ts

@@ -10,11 +10,9 @@ export { PublicationCommentData } from "./publication-comment.data";
 export { PublicationContentData } from "./publication-content.data";
 export { RoleData } from "./role.data";
 export { UserContactData } from "./user-contact.data";
-export { UserDetailData } from "./user-detail.data";
 export { UserData } from "./user.data";
 export { VentureCategoryData } from "./venture-category.data";
 export { VentureContactData } from "./venture-contact.data";
-export { VentureDetailData } from "./venture-detail.data";
 export { VentureEventData } from "./venture-event.data";
 export { VentureLocationData } from "./venture-location.data";
 export { VenturePublicationData } from "./venture-publication.data";

package/src/app/modules/infrastructure/database/entities/municipality.data.ts

@@ -10,7 +10,7 @@ import {
 } from "typeorm";
 
 import { DepartmentData } from "./department.data";
-import { UserDetailData } from "./user-detail.data";
+import { UserData } from "./user.data";
 
 @Entity({ name: "municipality" })
 export class MunicipalityData {
@@ -30,6 +30,6 @@ export class MunicipalityData {
   @JoinColumn({ name: "departmentId" })
   department: DepartmentData;
 
-  @OneToMany(() => UserDetailData, (ud) => ud.municipality)
-  userDetails: UserDetailData[];
+  @OneToMany(() => UserData, (user) => user.municipality)
+  users: UserData[];
 }

package/src/app/modules/infrastructure/database/entities/notification.data.ts

@@ -10,7 +10,7 @@ import {
 
 import { NotificationType } from "../../../domain/notifications";
 import { NotificationStatus } from "../../../domain/notifications/notification";
-import { UserDetailData } from "./user-detail.data";
+import { UserData } from "./user.data";
 
 @Entity({ name: "notification" })
 export class NotificationData {
@@ -29,16 +29,13 @@ export class NotificationData {
   @Column()
   description: string;
 
+  @ManyToOne(() => UserData, (user) => user.notifications)
+  @JoinColumn({ name: "userId" })
+  user: UserData;
+
   @CreateDateColumn()
   createdAt: Date;
 
   @UpdateDateColumn()
   updatedAt: Date;
-
-  @Column()
-  userDetailId: string;
-
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.notifications)
-  @JoinColumn({ name: "userDetailId" })
-  user: UserDetailData;
 }