echadospalante-core 9.3.3 → 9.5.0

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

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

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

@@ -18,6 +18,7 @@ export interface Venture {
   contact?: VentureContact;
   location?: VentureLocation;
   createdAt: Date;
+  updatedAt: Date;
 }
 
 export interface VentureCreate {
@@ -34,4 +35,4 @@ export interface VentureCreate {
     lng?: number;
     description?: string;
   };
-}
+}

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

@@ -30,14 +30,11 @@ export class EventCategoryData {
   @UpdateDateColumn()
   updatedAt: Date;
 
-  @ManyToMany(
-    () => VentureEventData,
-    (ventureEvent) => ventureEvent.EventCategory
-  )
+  @ManyToMany(() => VentureEventData, (ventureEvent) => ventureEvent.categories)
   @JoinTable({
     name: "x_event_category",
     joinColumn: { name: "categoryId", referencedColumnName: "id" },
     inverseJoinColumn: { name: "eventId", referencedColumnName: "id" },
   })
-  ventureEvent: VentureEventData[];
+  events: VentureEventData[];
 }

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

@@ -16,20 +16,14 @@ export class EventDonationData {
   id: string;
 
   @Column()
-  eventId: string;
-
-  @Column("float")
-  amount: number;
+  currency: string;
 
   @Column()
-  currency: string;
+  amount: number;
 
   @CreateDateColumn()
   createdAt: Date;
 
-  @Column()
-  donorDetailId: string;
-
   @ManyToOne(() => UserDetailData, (userDetail) => userDetail.donations)
   @JoinColumn({ name: "donorDetailId" })
   donor: UserDetailData;

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

@@ -7,14 +7,14 @@ export class EventLocationData {
   id: string;
 
   @Column("float", { nullable: true })
-  lat: number;
+  lat?: number;
 
   @Column("float", { nullable: true })
-  lng: number;
+  lng?: number;
 
   @Column({ nullable: true })
-  description: string;
+  description?: string;
 
   @OneToOne(() => VentureEventData, (ventureEvent) => ventureEvent.location)
-  event: VentureEventData;
+  event?: VentureEventData;
 }

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

@@ -20,9 +20,6 @@ export class MunicipalityData {
   @Column()
   name: string;
 
-  @Column()
-  departmentId: number;
-
   @CreateDateColumn()
   createdAt: Date;
 

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

@@ -16,23 +16,17 @@ export class PublicationClapData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column()
-  publicationId: string;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @Column()
-  userDetailId: string;
-
   @ManyToOne(
     () => VenturePublicationData,
     (venturePublication) => venturePublication.claps
   )
   @JoinColumn({ name: "publicationId" })
-  venturePublication: VenturePublicationData;
+  publication: VenturePublicationData;
 
   @ManyToOne(() => UserDetailData, (userDetail) => userDetail.publicationClaps)
   @JoinColumn({ name: "userDetailId" })
   user: UserDetailData;
+
+  @CreateDateColumn()
+  createdAt: Date;
 }

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

@@ -16,29 +16,20 @@ export class PublicationCommentData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column()
-  authorDetailId: string;
-
-  @Column()
-  publicationId: string;
-
-  @Column()
-  body: string;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-
   @ManyToOne(() => UserDetailData, (userDetail) => userDetail.comments)
   @JoinColumn({ name: "authorDetailId" })
-  User: UserDetailData;
+  author: UserDetailData;
+
+  @Column()
+  content: string;
 
   @ManyToOne(
     () => VenturePublicationData,
     (venturePublication) => venturePublication.comments
   )
   @JoinColumn({ name: "publicationId" })
-  venturePublication: VenturePublicationData;
+  publication: VenturePublicationData;
+
+  @CreateDateColumn()
+  createdAt: Date;
 }

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

@@ -22,9 +22,6 @@ export class PublicationContentData {
   @Column()
   content: string;
 
-  @Column()
-  publicationId: string;
-
   @CreateDateColumn()
   createdAt: Date;
 
@@ -36,5 +33,5 @@ export class PublicationContentData {
     (venturePublication) => venturePublication.contents
   )
   @JoinColumn({ name: "publicationId" })
-  venturePublication: VenturePublicationData;
+  publication: VenturePublicationData;
 }

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

@@ -28,5 +28,5 @@ export class RoleData {
   updatedAt: Date;
 
   @ManyToMany(() => UserData, (user) => user.roles, { eager: false })
-  users: UserData[];
+  users?: UserData[];
 }

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

@@ -24,21 +24,24 @@ export class UserDetailData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column()
-  gender: string;
+  @Column({ type: "enum", enum: ["M", "F", "O"] })
+  gender: "M" | "F" | "O";
 
   @Column()
   birthDate: Date;
 
-  @Column()
-  municipalityId: number;
-
   @OneToOne(() => UserData, (user) => user.detail)
-  user: UserData;
+  user?: UserData;
 
   @ManyToOne(() => MunicipalityData, (municipality) => municipality.userDetails)
   @JoinColumn({ name: "municipalityId" })
-  municipality: MunicipalityData;
+  municipality?: MunicipalityData;
+
+  @OneToMany(
+    () => PublicationCommentData,
+    (publicationComment) => publicationComment.author
+  )
+  comments: PublicationCommentData[];
 
   @OneToMany(() => EventDonationData, (eventDonation) => eventDonation.donor)
   donations: EventDonationData[];
@@ -52,24 +55,18 @@ export class UserDetailData {
   )
   publicationClaps: PublicationClapData[];
 
-  @OneToMany(
-    () => PublicationCommentData,
-    (publicationComment) => publicationComment.User
-  )
-  comments: PublicationCommentData[];
-
-  @OneToMany(() => VentureData, (venture) => venture.ownerDetail)
-  ventures: VentureData[];
-
   @OneToMany(
     () => VentureSponsorshipData,
-    (ventureSponsorship) => ventureSponsorship.user
+    (ventureSponsorship) => ventureSponsorship.sponsor
   )
   sponsorships: VentureSponsorshipData[];
 
   @OneToMany(
     () => VentureSubscriptionData,
-    (ventureSubscription) => ventureSubscription.user
+    (ventureSubscription) => ventureSubscription.subscriber
   )
   subscriptions: VentureSubscriptionData[];
+
+  @OneToMany(() => VentureData, (venture) => venture.ownerDetail)
+  ventures: VentureData[];
 }

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

@@ -31,8 +31,8 @@ export class VentureCategoryData {
   updatedAt: Date;
 
   @ManyToMany(() => UserData, (user) => user.preferences)
-  users: UserData[];
+  users?: UserData[];
 
   @ManyToMany(() => VentureData, (venture) => venture.categories)
-  ventures: VentureData[];
+  ventures?: VentureData[];
 }

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

@@ -26,5 +26,5 @@ export class VentureContactData {
   updatedAt: Date;
 
   @OneToOne(() => VentureData, (venture) => venture.contact)
-  Venture: VentureData;
+  Venture?: VentureData;
 }

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

@@ -25,7 +25,7 @@ export class VentureDetailData {
   updatedAt: Date;
 
   @OneToOne(() => VentureData, (venture) => venture.detail)
-  venture: VentureData;
+  venture?: VentureData;
 
   @OneToMany(
     () => VentureEventData,

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

@@ -29,8 +29,19 @@ export class VentureEventData {
   @Column()
   coverPhoto: string;
 
-  @Column()
-  ventureId: string;
+  @ManyToOne(() => VentureDetailData, (ventureDetail) => ventureDetail.events)
+  @JoinColumn({ name: "ventureId" })
+  ventureDetail?: VentureDetailData;
+
+  @OneToOne(() => EventLocationData, (eventLocation) => eventLocation.event)
+  @JoinColumn({ name: "locationId" })
+  location: EventLocationData;
+
+  @ManyToMany(() => EventCategoryData, (eventCategory) => eventCategory.events)
+  categories: EventCategoryData[];
+
+  @OneToMany(() => EventDonationData, (eventDonation) => eventDonation.event)
+  donations: EventDonationData[];
 
   @Column()
   startDate: Date;
@@ -43,24 +54,4 @@ export class VentureEventData {
 
   @UpdateDateColumn()
   updatedAt: Date;
-
-  @Column({ unique: true })
-  locationId: string;
-
-  @ManyToOne(() => VentureDetailData, (ventureDetail) => ventureDetail.events)
-  @JoinColumn({ name: "ventureId" })
-  ventureDetail: VentureDetailData;
-
-  @OneToOne(() => EventLocationData, (eventLocation) => eventLocation.event)
-  @JoinColumn({ name: "locationId" })
-  location: EventLocationData;
-
-  @OneToMany(() => EventDonationData, (eventDonation) => eventDonation.event)
-  donations: EventDonationData[];
-
-  @ManyToMany(
-    () => EventCategoryData,
-    (eventCategory) => eventCategory.ventureEvent
-  )
-  EventCategory: EventCategoryData[];
 }

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

@@ -13,17 +13,14 @@ export class VentureLocationData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column({ nullable: true })
-  ventureId: string;
-
   @Column("float", { nullable: true })
-  lat: number;
+  lat?: number;
 
   @Column("float", { nullable: true })
-  lng: number;
+  lng?: number;
 
   @Column({ nullable: true })
-  description: string;
+  description?: string;
 
   @CreateDateColumn()
   createdAt: Date;
@@ -32,5 +29,5 @@ export class VentureLocationData {
   updatedAt: Date;
 
   @OneToOne(() => VentureData, (venture) => venture.location)
-  Venture: VentureData;
+  Venture?: VentureData;
 }

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

@@ -13,7 +13,7 @@ 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/feeds";
+import { PublicationType } from "../../../domain/publications";
 
 @Entity()
 export class VenturePublicationData {
@@ -47,19 +47,19 @@ export class VenturePublicationData {
 
   @OneToMany(
     () => PublicationClapData,
-    (publicationClap) => publicationClap.venturePublication
+    (publicationClap) => publicationClap.publication
   )
   claps: PublicationClapData[];
 
   @OneToMany(
     () => PublicationCommentData,
-    (publicationComment) => publicationComment.venturePublication
+    (publicationComment) => publicationComment.publication
   )
   comments: PublicationCommentData[];
 
   @OneToMany(
     () => PublicationContentData,
-    (publicationContent) => publicationContent.venturePublication
+    (publicationContent) => publicationContent.publication
   )
   contents: PublicationContentData[];
 }

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

@@ -15,9 +15,6 @@ export class VentureSponsorshipData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column()
-  ventureDetailId: string;
-
   @Column("float")
   monthlyAmount: number;
 
@@ -27,17 +24,14 @@ export class VentureSponsorshipData {
   @UpdateDateColumn()
   updatedAt: Date;
 
-  @Column()
-  sponsorDetailId: string;
-
   @ManyToOne(() => UserDetailData, (userDetail) => userDetail.sponsorships)
   @JoinColumn({ name: "sponsorDetailId" })
-  user: UserDetailData;
+  sponsor?: UserDetailData;
 
   @ManyToOne(
     () => VentureDetailData,
     (ventureDetail) => ventureDetail.sponsorships
   )
   @JoinColumn({ name: "ventureDetailId" })
-  detail: VentureDetailData;
+  detail?: VentureDetailData;
 }

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

@@ -15,23 +15,17 @@ export class VentureSubscriptionData {
   @PrimaryGeneratedColumn("uuid")
   id: string;
 
-  @Column()
-  ventureId: string;
-
   @CreateDateColumn()
   createdAt: Date;
 
-  @Column()
-  subscriberDetailId: string;
-
   @ManyToOne(() => UserDetailData, (userDetail) => userDetail.subscriptions)
   @JoinColumn({ name: "subscriberDetailId" })
-  user: UserDetailData;
+  subscriber?: UserDetailData;
 
   @ManyToOne(
     () => VentureDetailData,
     (ventureDetail) => ventureDetail.subscriptions
   )
   @JoinColumn({ name: "ventureId" })
-  detail: VentureDetailData;
+  detail?: VentureDetailData;
 }

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

@@ -10,6 +10,7 @@ import {
   JoinTable,
   JoinColumn,
 } from "typeorm";
+
 import { VentureDetailData } from "./venture-detail.data";
 import { VentureLocationData } from "./venture-location.data";
 import { UserDetailData } from "./user-detail.data";
@@ -39,45 +40,33 @@ export class VentureData {
   @Column({ default: false })
   verified: boolean;
 
-  @Column({ unique: true })
-  detailId: string;
-
   @CreateDateColumn()
   createdAt: Date;
 
   @UpdateDateColumn()
   updatedAt: Date;
 
-  @Column({ unique: true })
-  locationId: string;
-
-  @Column()
-  ownerDetailId: string;
-
-  @Column({ unique: true })
-  ventureContactId: string;
-
   @OneToOne(() => VentureDetailData, (ventureDetail) => ventureDetail.venture)
   @JoinColumn({ name: "detailId" })
-  detail: VentureDetailData;
+  detail?: VentureDetailData;
 
   @OneToOne(
     () => VentureLocationData,
     (ventureLocation) => ventureLocation.Venture
   )
   @JoinColumn({ name: "locationId" })
-  location: VentureLocationData;
+  location?: VentureLocationData;
 
   @ManyToOne(() => UserDetailData, (userDetail) => userDetail.ventures)
   @JoinColumn({ name: "ownerDetailId" })
-  ownerDetail: UserDetailData;
+  ownerDetail?: UserDetailData;
 
   @OneToOne(
     () => VentureContactData,
     (ventureContact) => ventureContact.Venture
   )
   @JoinColumn({ name: "ventureContactId" })
-  contact: VentureContactData;
+  contact?: VentureContactData;
 
   @ManyToMany(
     () => VentureCategoryData,

package/src/index.ts

@@ -1,9 +1,8 @@
 import "reflect-metadata";
 
 export * from "./app/modules/domain/auth";
-export * from "./app/modules/domain/donations";
-export * from "./app/modules/domain/feeds";
-export * from "./app/modules/domain/news";
+export * from "./app/modules/domain/contributions";
+export * from "./app/modules/domain/publications";
 export * from "./app/modules/domain/notifications";
 export * from "./app/modules/domain/shared";
 export * from "./app/modules/domain/user";

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

@@ -1,9 +0,0 @@
-import { News } from "./news";
-
-export interface NewsCategory {
-  id: number;
-  name: string;
-  slug: string;
-  description: string;
-  news: News[];
-}

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

@@ -1,9 +0,0 @@
-import { User } from "../auth";
-import { News } from "./news";
-
-export interface NewsClap {
-  id: number;
-  user: User;
-  news: News;
-  createdAt: Date;
-}

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

@@ -1,5 +0,0 @@
-export { NewsCategory } from "./category";
-export { NewsClap } from "./clap";
-
-export { News } from "./news";
-export { NewsContent } from "./news";

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

@@ -1,20 +0,0 @@
-import { ContentType } from "../shared";
-import { NewsCategory } from "./category";
-import { NewsClap } from "./clap";
-
-export interface News {
-  id: string;
-  title: string;
-  slug: string;
-  claps: NewsClap[];
-  comments: Comment[];
-  body: NewsContent[];
-  categories: NewsCategory[];
-  createdAt: Date;
-}
-
-export interface NewsContent {
-  id: string;
-  type: ContentType;
-  content: string; // JSON string
-}