Merge pull request #1 from podverse/v5-develop

Update to 5.1.16-alpha

Author: mitchdowney

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-orm",
-  "version": "5.1.15-develop",
+  "version": "5.1.16-develop",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,9 +15,6 @@
   },
   "author": "",
   "license": "AGPLv3",
-  "overrides": {
-    "fast-xml-parser": "^4.1.2"
-  },
   "dependencies": {
     "async-mutex": "^0.5.0",
     "bcrypt": "^6.0.0",

package.json

@@ -15,5 +15,12 @@ export const config = {
     level: process.env.LOG_LEVEL || 'info',
     dir: process.env.LOG_DIR || 'logs',
     timer: process.env.LOG_TIMER === 'true',
+  },
+  defaults: {
+    account: {
+      settings: {
+        locale: process.env.DEFAULT_ACCOUNT_SETTINGS_LOCALE || 'en-US',
+      }
+    }
   }
 };

src/config/index.ts

@@ -98,6 +98,11 @@ import { StatsTrackEventAccount } from "@orm/entities/stats/statsTrackEventAccou
 import { StatsTrackEventClip } from "@orm/entities/stats/statsTrackEventClip";
 import { StatsTrackEventItem } from "@orm/entities/stats/statsTrackEventItem";
 import { StatsTrackEventPlaylist } from "@orm/entities/stats/statsTrackEventPlaylist";
+import { AccountNotificationChannelType } from "@orm/entities/account/accountNotificationChannelType";
+import { AccountSettings } from "@orm/entities/account/accountSettings/accountSettings";
+import { AccountSettingsNotification } from "@orm/entities/account/accountSettings/accountSettingsNotification";
+import { AccountSettingsNotificationType } from "@orm/entities/account/accountSettings/accountSettingsNotificationType";
+import { AccountSettingsLocale } from "@orm/entities/account/accountSettings/accountSettingsLocale";
 
 const commonConfig: DataSourceOptions = {
   type: "postgres",
@@ -121,9 +126,14 @@ const commonConfig: DataSourceOptions = {
     AccountMembership,
     AccountMembershipStatus,
     AccountNotificationChannel,
+    AccountNotificationChannelType,
     AccountPayPalOrder,
     AccountProfile,
     AccountResetPassword,
+    AccountSettings,
+    AccountSettingsLocale,
+    AccountSettingsNotification,
+    AccountSettingsNotificationType,
     AccountUpDevice,
     AccountVerification,
     Category,

src/db/index.ts

@@ -16,6 +16,7 @@ import { AccountResetPassword } from './accountResetPassword';
 import { AccountUpDevice } from './accountUPDevice';
 import { AccountVerification } from './accountVerification';
 import { generateRandomIdText } from '@orm/lib/nanoid';
+import { AccountSettings } from './accountSettings/accountSettings';
 
 @Entity()
 export class Account {
@@ -71,6 +72,9 @@ export class Account {
   @OneToOne(() => AccountResetPassword, accountResetPassword => accountResetPassword.account)
   account_reset_password!: AccountResetPassword;
 
+  @OneToOne(() => AccountSettings, accountSettings => accountSettings.account, { cascade: ['insert'] })
+  account_settings!: AccountSettings;
+
   @OneToMany(() => AccountUpDevice, accountUpDevice => accountUpDevice.account)
   account_up_devices!: AccountUpDevice[];
 

src/entities/account/account.ts

@@ -1,18 +1,33 @@
-import { DATABASE_CONSTANTS } from 'podverse-helpers';
-import { Entity, Column, ManyToOne, JoinColumn, PrimaryGeneratedColumn } from 'typeorm';
+import { DATABASE_CONSTANTS, AccountFCMDevicePlatformEnum } from 'podverse-helpers';
+import { Entity, Column, ManyToOne, JoinColumn, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
 import { Account } from '@orm/entities/account/account';
 
 @Entity()
 export class AccountFCMDevice {
   @PrimaryGeneratedColumn()
   id!: number;
 
-  @Column({ type: 'varchar', unique: true, length: DATABASE_CONSTANTS.varchar_fcm_token })
+  @Column({ type: 'varchar', length: DATABASE_CONSTANTS.varchar_fcm_token, unique: true })
   fcm_token!: string;
 
+  @Column({ type: 'varchar', length: DATABASE_CONSTANTS.varchar_guid, unique: true })
+  installation_id!: string;
+
   @Column()
   account_id!: number;
 
+  @Column({ type: 'enum', enum: AccountFCMDevicePlatformEnum })
+  platform!: AccountFCMDevicePlatformEnum;
+
+  @Column({ type: 'varchar', length: DATABASE_CONSTANTS.varchar_locale })
+  locale!: string;
+
+  @CreateDateColumn({ name: 'created_at', type: 'timestamp' })
+  created_at!: Date;
+
+  @UpdateDateColumn({ name: 'updated_at', type: 'timestamp' })
+  updated_at!: Date;
+
   @ManyToOne(() => Account, account => account.id, { onDelete: 'CASCADE' })
   @JoinColumn({ name: 'account_id' })
   account!: Account;

src/entities/account/accountFCMDevice.ts

@@ -1,13 +1,18 @@
-import { Entity, PrimaryColumn, ManyToOne, JoinColumn } from 'typeorm';
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, OneToMany, Unique } from 'typeorm';
 import { Account } from '@orm/entities/account/account';
 import { Channel } from '@orm/entities/channel/channel';
+import { AccountNotificationChannelType } from './accountNotificationChannelType';
 
 @Entity()
+@Unique(['channel_id', 'account_id'])
 export class AccountNotificationChannel {
-  @PrimaryColumn()
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  @Column()
   channel_id!: number;
 
-  @PrimaryColumn()
+  @Column()
   account_id!: number;
 
   @ManyToOne(() => Channel, channel => channel.id, { onDelete: 'CASCADE' })
@@ -17,4 +22,7 @@ export class AccountNotificationChannel {
   @ManyToOne(() => Account, account => account.id, { onDelete: 'CASCADE' })
   @JoinColumn({ name: 'account_id' })
   account!: Account;
+
+  @OneToMany(() => AccountNotificationChannelType, accountNotificationChannelType => accountNotificationChannelType.account_notification_channel)
+  account_notification_channel_types!: AccountNotificationChannelType[];
 }

src/entities/account/accountNotificationChannel.ts

@@ -0,0 +1,20 @@
+import { AccountNotificationTypeEnum } from 'podverse-helpers';
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { AccountNotificationChannel } from '@orm/entities/account/accountNotificationChannel';
+
+@Entity()
+export class AccountNotificationChannelType {
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  @Column({ type: 'enum', enum: AccountNotificationTypeEnum })
+  type!: AccountNotificationTypeEnum;
+
+  @ManyToOne(
+    () => AccountNotificationChannel,
+    accountNotificationChannel => accountNotificationChannel.account_notification_channel_types,
+    { onDelete: 'CASCADE' }
+  )
+  @JoinColumn({ name: 'account_notification_channel_id' })
+  account_notification_channel!: AccountNotificationChannel;
+}

src/entities/account/accountNotificationChannelType.ts

@@ -0,0 +1,23 @@
+import { Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from 'typeorm';
+import { Account } from '@orm/entities/account/account';
+import { AccountSettingsLocale } from './accountSettingsLocale';
+import { AccountSettingsNotification } from './accountSettingsNotification';
+
+@Entity()
+export class AccountSettings {
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  @Column({ name: 'account_id', unique: true })
+  account_id!: number;
+
+  @OneToOne(() => Account, account => account.account_settings, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'account_id' })
+  account!: Account;
+
+  @OneToOne(() => AccountSettingsLocale, accountSettingsLocale => accountSettingsLocale.account_settings, { cascade: ['insert'] })
+  account_settings_locale!: AccountSettingsLocale;
+
+  @OneToOne(() => AccountSettingsNotification, accountSettingsNotification => accountSettingsNotification.account_settings, { cascade: ['insert'] })
+  account_settings_notification!: AccountSettingsNotification;
+}

src/entities/account/accountSettings/accountSettings.ts

@@ -0,0 +1,19 @@
+import { Entity, PrimaryGeneratedColumn, Column, OneToOne, JoinColumn } from 'typeorm';
+import { AccountSettings } from './accountSettings';
+import { DATABASE_CONSTANTS } from 'podverse-helpers';
+
+@Entity()
+export class AccountSettingsLocale {
+  @PrimaryGeneratedColumn()
+  id!: number;
+
+  @Column({ name: 'account_settings_id', unique: true })
+  account_settings_id!: number;
+
+  @OneToOne(() => AccountSettings, accountSettings => accountSettings.account_settings_locale, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'account_settings_id' })
+  account_settings!: AccountSettings;
+
+  @Column({ type: 'varchar', length: DATABASE_CONSTANTS.varchar_locale, default: 'en-US' })
+  locale!: string;
+}