echadospalante-core 13.0.5 → 14.0.0

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;
 }

package/src/app/modules/infrastructure/database/entities/publication-clap.data.ts

@@ -8,8 +8,8 @@ import {
   JoinColumn,
 } from "typeorm";
 
-import { UserDetailData } from "./user-detail.data";
 import { VenturePublicationData } from "./venture-publication.data";
+import { UserData } from "./user.data";
 
 @Entity({ name: "publication_clap" })
 export class PublicationClapData {
@@ -23,9 +23,9 @@ export class PublicationClapData {
   @JoinColumn({ name: "publicationId" })
   publication: VenturePublicationData;
 
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.publicationClaps)
-  @JoinColumn({ name: "userDetailId" })
-  user: UserDetailData;
+  @ManyToOne(() => UserData, (user) => user.publicationClaps)
+  @JoinColumn({ name: "userId" })
+  user: UserData;
 
   @CreateDateColumn()
   createdAt: Date;

package/src/app/modules/infrastructure/database/entities/publication-comment.data.ts

@@ -8,17 +8,17 @@ import {
   UpdateDateColumn,
 } from "typeorm";
 
-import { UserDetailData } from "./user-detail.data";
 import { VenturePublicationData } from "./venture-publication.data";
+import { UserData } from "./user.data";
 
 @Entity({ name: "publication_comment" })
 export class PublicationCommentData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.comments)
-  @JoinColumn({ name: "authorDetailId" })
-  author: UserDetailData;
+  @ManyToOne(() => UserData, (user) => user.comments)
+  @JoinColumn({ name: "authorId" })
+  author: UserData;
 
   @Column()
   content: string;

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

@@ -18,9 +18,6 @@ export class RoleData {
   @Column({ type: "enum", enum: AppRole, unique: true })
   name: AppRole;
 
-  @Column({ type: "enum", enum: AppRole, default: AppRole.USER })
-  label2: string;
-
   @Column({ default: "" })
   label: string;
 

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

@@ -5,15 +5,24 @@ import {
   JoinColumn,
   JoinTable,
   ManyToMany,
+  ManyToOne,
+  OneToMany,
   OneToOne,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from "typeorm";
 
+import { EventDonationData } from "./event-donation.data";
+import { MunicipalityData } from "./municipality.data";
+import { NotificationData } from "./notification.data";
+import { PublicationClapData } from "./publication-clap.data";
+import { PublicationCommentData } from "./publication-comment.data";
 import { RoleData } from "./role.data";
 import { UserContactData } from "./user-contact.data";
-import { UserDetailData } from "./user-detail.data";
 import { VentureCategoryData } from "./venture-category.data";
+import { VentureSponsorshipData } from "./venture-sponsorship.data";
+import { VentureSubscriptionData } from "./venture-subscription.data";
+import { VentureData } from "./venture.data";
 
 @Entity({ name: "user" })
 export class UserData {
@@ -51,10 +60,6 @@ export class UserData {
   @JoinColumn({ name: "contactId" })
   contact?: UserContactData;
 
-  @OneToOne(() => UserDetailData, (detail) => detail.user)
-  @JoinColumn({ name: "detailId" })
-  detail?: UserDetailData;
-
   @ManyToMany(() => VentureCategoryData, (vc) => vc.users)
   @JoinTable({ name: "x_user_preference" })
   preferences: VentureCategoryData[];
@@ -62,4 +67,47 @@ export class UserData {
   @ManyToMany(() => RoleData, (role) => role.users, { eager: true })
   @JoinTable({ name: "x_user_role" })
   roles: RoleData[];
+
+  @Column({ type: "enum", enum: ["M", "F", "O"] })
+  gender: "M" | "F" | "O";
+
+  @Column()
+  birthDate: Date;
+
+  @ManyToOne(() => MunicipalityData, (municipality) => municipality.users)
+  @JoinColumn({ name: "municipalityId" })
+  municipality?: MunicipalityData;
+
+  @OneToMany(
+    () => PublicationCommentData,
+    (publicationComment) => publicationComment.author
+  )
+  comments: PublicationCommentData[];
+
+  @OneToMany(() => EventDonationData, (eventDonation) => eventDonation.donor)
+  donations: EventDonationData[];
+
+  @OneToMany(() => NotificationData, (notification) => notification.user)
+  notifications: NotificationData[];
+
+  @OneToMany(
+    () => PublicationClapData,
+    (publicationClap) => publicationClap.user
+  )
+  publicationClaps: PublicationClapData[];
+
+  @OneToMany(
+    () => VentureSponsorshipData,
+    (ventureSponsorship) => ventureSponsorship.sponsor
+  )
+  sponsorships: VentureSponsorshipData[];
+
+  @OneToMany(
+    () => VentureSubscriptionData,
+    (ventureSubscription) => ventureSubscription.subscriber
+  )
+  subscriptions: VentureSubscriptionData[];
+
+  @OneToMany(() => VentureData, (venture) => venture.owner)
+  ventures: VentureData[];
 }

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

@@ -12,9 +12,9 @@ import {
 } from "typeorm";
 import { EventLocationData } from "./event-location.data";
 import { EventDonationData } from "./event-donation.data";
-import { VentureDetailData } from "./venture-detail.data";
 import { EventCategoryData } from "./event-category.data";
 import { EventContactData } from "./event-contact.data";
+import { VentureData } from "./venture.data";
 
 @Entity({ name: "venture_event" })
 export class VentureEventData {
@@ -33,9 +33,9 @@ export class VentureEventData {
   @Column({ type: "varchar", unique: true })
   slug: string;
 
-  @ManyToOne(() => VentureDetailData, (ventureDetail) => ventureDetail.events)
+  @ManyToOne(() => VentureData, (venture) => venture.events)
   @JoinColumn({ name: "ventureId" })
-  ventureDetail?: VentureDetailData;
+  venture?: VentureData;
 
   @JoinColumn({ name: "locationId" })
   @OneToOne(() => EventLocationData, (eventLocation) => eventLocation.event, {

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

@@ -11,9 +11,9 @@ import {
 } from "typeorm";
 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";
 
 @Entity({ name: "venture_publication" })
 export class VenturePublicationData {
@@ -35,15 +35,9 @@ export class VenturePublicationData {
   @UpdateDateColumn()
   updatedAt: Date;
 
-  @Column()
-  detailId: string;
-
-  @ManyToOne(
-    () => VentureDetailData,
-    (ventureDetail) => ventureDetail.publications
-  )
-  @JoinColumn({ name: "detailId" })
-  detail: VentureDetailData;
+  @ManyToOne(() => VentureData, (venture) => venture.publications)
+  @JoinColumn({ name: "ventureId" })
+  venture: VentureData;
 
   @OneToMany(
     () => PublicationClapData,

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

@@ -7,8 +7,8 @@ import {
   ManyToOne,
   JoinColumn,
 } from "typeorm";
-import { UserDetailData } from "./user-detail.data";
-import { VentureDetailData } from "./venture-detail.data";
+import { UserData } from "./user.data";
+import { VentureData } from "./venture.data";
 
 @Entity({ name: "venture_sponsorship" })
 export class VentureSponsorshipData {
@@ -24,14 +24,11 @@ export class VentureSponsorshipData {
   @UpdateDateColumn()
   updatedAt: Date;
 
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.sponsorships)
-  @JoinColumn({ name: "sponsorDetailId" })
-  sponsor?: UserDetailData;
+  @ManyToOne(() => UserData, (user) => user.sponsorships)
+  @JoinColumn({ name: "sponsorId" })
+  sponsor?: UserData;
 
-  @ManyToOne(
-    () => VentureDetailData,
-    (ventureDetail) => ventureDetail.sponsorships
-  )
-  @JoinColumn({ name: "ventureDetailId" })
-  detail?: VentureDetailData;
+  @ManyToOne(() => VentureData, (venture) => venture.sponsorships)
+  @JoinColumn({ name: "ventureId" })
+  venture?: VentureData;
 }

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

@@ -6,9 +6,8 @@ import {
   ManyToOne,
   PrimaryGeneratedColumn,
 } from "typeorm";
-
-import { UserDetailData } from "./user-detail.data";
-import { VentureDetailData } from "./venture-detail.data";
+import { UserData } from "./user.data";
+import { VentureData } from "./venture.data";
 
 @Entity({ name: "venture_subscription" })
 export class VentureSubscriptionData {
@@ -18,14 +17,11 @@ export class VentureSubscriptionData {
   @CreateDateColumn()
   createdAt: Date;
 
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.subscriptions)
-  @JoinColumn({ name: "subscriberDetailId" })
-  subscriber?: UserDetailData;
+  @ManyToOne(() => UserData, (user) => user.subscriptions)
+  @JoinColumn({ name: "subscriberId" })
+  subscriber?: UserData;
 
-  @ManyToOne(
-    () => VentureDetailData,
-    (ventureDetail) => ventureDetail.subscriptions
-  )
+  @ManyToOne(() => VentureData, (venture) => venture.subscriptions)
   @JoinColumn({ name: "ventureId" })
-  detail?: VentureDetailData;
+  venture?: VentureData;
 }

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

@@ -1,21 +1,25 @@
 import {
-  Entity,
-  PrimaryGeneratedColumn,
   Column,
   CreateDateColumn,
-  UpdateDateColumn,
-  OneToOne,
-  ManyToOne,
-  ManyToMany,
-  JoinTable,
+  Entity,
   JoinColumn,
+  JoinTable,
+  ManyToMany,
+  ManyToOne,
+  OneToMany,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
 } from "typeorm";
 
-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";
 
 @Entity({ name: "venture" })
 export class VentureData {
@@ -46,12 +50,6 @@ export class VentureData {
   @UpdateDateColumn()
   updatedAt: Date;
 
-  @OneToOne(() => VentureDetailData, (ventureDetail) => ventureDetail.venture, {
-    cascade: true,
-  })
-  @JoinColumn({ name: "detailId" })
-  detail?: VentureDetailData;
-
   @OneToOne(
     () => VentureLocationData,
     (ventureLocation) => ventureLocation.Venture,
@@ -60,9 +58,9 @@ export class VentureData {
   @JoinColumn({ name: "locationId" })
   location?: VentureLocationData;
 
-  @ManyToOne(() => UserDetailData, (userDetail) => userDetail.ventures)
-  @JoinColumn({ name: "ownerDetailId" })
-  ownerDetail?: UserDetailData;
+  @ManyToOne(() => UserData, (user) => user.ventures)
+  @JoinColumn({ name: "ownerId" })
+  owner?: UserData;
 
   @OneToOne(
     () => VentureContactData,
@@ -83,4 +81,25 @@ export class VentureData {
     inverseJoinColumn: { name: "categoryId", referencedColumnName: "id" },
   })
   categories: VentureCategoryData[];
+
+  @OneToMany(() => VentureEventData, (ventureEvent) => ventureEvent.venture)
+  events: VentureEventData[];
+
+  @OneToMany(
+    () => VenturePublicationData,
+    (venturePublication) => venturePublication.venture
+  )
+  publications: VenturePublicationData[];
+
+  @OneToMany(
+    () => VentureSponsorshipData,
+    (ventureSponsorship) => ventureSponsorship.venture
+  )
+  sponsorships: VentureSponsorshipData[];
+
+  @OneToMany(
+    () => VentureSubscriptionData,
+    (ventureSubscription) => ventureSubscription.venture
+  )
+  subscriptions: VentureSubscriptionData[];
 }

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

@@ -1,23 +0,0 @@
-import { EventDonation, VentureSponsorship } from "../contributions";
-import { PublicationClap, PublicationComment } from "../publications";
-// import { NewsClap } from "../news";
-import { Municipality } from "../common/geo";
-import { Venture, VentureCategory, VentureSubscription } from "../ventures";
-import { User } from "./user";
-import { Notification } from "../notifications";
-
-export interface UserDetail {
-  id: string;
-  gender: "M" | "F" | "O";
-  birthDate: Date;
-  user?: User;
-  municipality?: Municipality;
-  comments: PublicationComment[];
-  donations: EventDonation[];
-  notifications: Notification[];
-  publicationClaps: PublicationClap[];
-  sponsorships: VentureSponsorship[];
-  // newsClaps: NewsClap[];
-  subscriptions: VentureSubscription[];
-  ventures: Venture[];
-}

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

@@ -1,14 +0,0 @@
-import { VentureSponsorship } from "../contributions/sponsor";
-import { VentureEvent } from "../events/event";
-import { VenturePublication } from "../publications/publication";
-import { VentureSubscription } from "./subscription";
-import { Venture } from "./venture";
-
-export interface VentureDetail {
-  id: string;
-  venture?: Venture;
-  events: VentureEvent[];
-  sponsorships: VentureSponsorship[];
-  subscriptions: VentureSubscription[];
-  publications: VenturePublication[];
-}

package/src/app/modules/infrastructure/database/entities/user-detail.data.ts

@@ -1,72 +0,0 @@
-// user-detail.entity.ts
-
-import {
-  Column,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  OneToMany,
-  OneToOne,
-  PrimaryGeneratedColumn,
-} from "typeorm";
-import { EventDonationData } from "./event-donation.data";
-import { MunicipalityData } from "./municipality.data";
-import { NotificationData } from "./notification.data";
-import { PublicationClapData } from "./publication-clap.data";
-import { PublicationCommentData } from "./publication-comment.data";
-import { UserData } from "./user.data";
-import { VentureSponsorshipData } from "./venture-sponsorship.data";
-import { VentureSubscriptionData } from "./venture-subscription.data";
-import { VentureData } from "./venture.data";
-
-@Entity({ name: "user_detail" })
-export class UserDetailData {
-  @PrimaryGeneratedColumn("uuid")
-  id: string;
-
-  @Column({ type: "enum", enum: ["M", "F", "O"] })
-  gender: "M" | "F" | "O";
-
-  @Column()
-  birthDate: Date;
-
-  @OneToOne(() => UserData, (user) => user.detail)
-  user?: UserData;
-
-  @ManyToOne(() => MunicipalityData, (municipality) => municipality.userDetails)
-  @JoinColumn({ name: "municipalityId" })
-  municipality?: MunicipalityData;
-
-  @OneToMany(
-    () => PublicationCommentData,
-    (publicationComment) => publicationComment.author
-  )
-  comments: PublicationCommentData[];
-
-  @OneToMany(() => EventDonationData, (eventDonation) => eventDonation.donor)
-  donations: EventDonationData[];
-
-  @OneToMany(() => NotificationData, (notification) => notification.user)
-  notifications: NotificationData[];
-
-  @OneToMany(
-    () => PublicationClapData,
-    (publicationClap) => publicationClap.user
-  )
-  publicationClaps: PublicationClapData[];
-
-  @OneToMany(
-    () => VentureSponsorshipData,
-    (ventureSponsorship) => ventureSponsorship.sponsor
-  )
-  sponsorships: VentureSponsorshipData[];
-
-  @OneToMany(
-    () => VentureSubscriptionData,
-    (ventureSubscription) => ventureSubscription.subscriber
-  )
-  subscriptions: VentureSubscriptionData[];
-
-  @OneToMany(() => VentureData, (venture) => venture.ownerDetail)
-  ventures: VentureData[];
-}

package/src/app/modules/infrastructure/database/entities/venture-detail.data.ts

@@ -1,53 +0,0 @@
-import {
-  CreateDateColumn,
-  Entity,
-  OneToMany,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from "typeorm";
-
-import { VentureEventData } from "./venture-event.data";
-import { VenturePublicationData } from "./venture-publication.data";
-import { VentureSponsorshipData } from "./venture-sponsorship.data";
-import { VentureSubscriptionData } from "./venture-subscription.data";
-import { VentureData } from "./venture.data";
-
-@Entity({ name: "venture_detail" })
-export class VentureDetailData {
-  @PrimaryGeneratedColumn("uuid")
-  id: string;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-
-  @OneToOne(() => VentureData, (venture) => venture.detail)
-  venture?: VentureData;
-
-  @OneToMany(
-    () => VentureEventData,
-    (ventureEvent) => ventureEvent.ventureDetail
-  )
-  events: VentureEventData[];
-
-  @OneToMany(
-    () => VenturePublicationData,
-    (venturePublication) => venturePublication.detail
-  )
-  publications: VenturePublicationData[];
-
-  @OneToMany(
-    () => VentureSponsorshipData,
-    (ventureSponsorship) => ventureSponsorship.detail
-  )
-  sponsorships: VentureSponsorshipData[];
-
-  @OneToMany(
-    () => VentureSubscriptionData,
-    (ventureSubscription) => ventureSubscription.detail
-  )
-  subscriptions: VentureSubscriptionData[];
-}