@earbug/db-models 0.0.7 → 0.0.8

package/models/PlaybackStatusType.ts

@@ -1,5 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { DataTypes, Model, Optional } from 'sequelize';
+import type { JukeboxQueueEntry, JukeboxQueueEntryId } from './JukeboxQueueEntry';
 
 export interface PlaybackStatusTypeAttributes {
   id: number;
@@ -14,6 +15,18 @@ export class PlaybackStatusType extends Model<PlaybackStatusTypeAttributes, Play
   id!: number;
   description!: string;
 
+  // PlaybackStatusType hasMany JukeboxQueueEntry via playbackStatusTypeId
+  jukeboxQueueEntries!: JukeboxQueueEntry[];
+  getJukeboxQueueEntries!: Sequelize.HasManyGetAssociationsMixin<JukeboxQueueEntry>;
+  setJukeboxQueueEntries!: Sequelize.HasManySetAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  addJukeboxQueueEntry!: Sequelize.HasManyAddAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  addJukeboxQueueEntries!: Sequelize.HasManyAddAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  createJukeboxQueueEntry!: Sequelize.HasManyCreateAssociationMixin<JukeboxQueueEntry>;
+  removeJukeboxQueueEntry!: Sequelize.HasManyRemoveAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  removeJukeboxQueueEntries!: Sequelize.HasManyRemoveAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  hasJukeboxQueueEntry!: Sequelize.HasManyHasAssociationMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  hasJukeboxQueueEntries!: Sequelize.HasManyHasAssociationsMixin<JukeboxQueueEntry, JukeboxQueueEntryId>;
+  countJukeboxQueueEntries!: Sequelize.HasManyCountAssociationsMixin;
 
   static initModel(sequelize: Sequelize.Sequelize): typeof PlaybackStatusType {
     return PlaybackStatusType.init({

package/models/State.ts

@@ -5,8 +5,8 @@ import type { PlatformUserPlaylist, PlatformUserPlaylistId } from './PlatformUse
 import type { PlatformUserPlaylistTrack, PlatformUserPlaylistTrackId } from './PlatformUserPlaylistTrack';
 
 export interface StateAttributes {
-  id: number;
   description: string;
+  id: number;
 }
 
 export type StatePk = "id";
@@ -14,8 +14,8 @@ export type StateId = State[StatePk];
 export type StateCreationAttributes = StateAttributes;
 
 export class State extends Model<StateAttributes, StateCreationAttributes> implements StateAttributes {
-  id!: number;
   description!: string;
+  id!: number;
 
   // State hasMany AppUser via stateId
   appUsers!: AppUser[];
@@ -56,16 +56,16 @@ export class State extends Model<StateAttributes, StateCreationAttributes> imple
 
   static initModel(sequelize: Sequelize.Sequelize): typeof State {
     return State.init({
+    description: {
+      type: DataTypes.TEXT,
+      allowNull: false
+    },
     id: {
       autoIncrement: true,
       autoIncrementIdentity: true,
       type: DataTypes.SMALLINT,
       allowNull: false,
       primaryKey: true
-    },
-    description: {
-      type: DataTypes.TEXT,
-      allowNull: false
     }
   }, {
     sequelize,

package/models/UnmatchedAlbum.ts

@@ -3,8 +3,8 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { PlatformAlbum, PlatformAlbumId } from './PlatformAlbum';
 
 export interface UnmatchedAlbumAttributes {
-  id: string;
   platformAlbumId: string;
+  id: string;
   createDate: Date;
 }
 
@@ -14,8 +14,8 @@ export type UnmatchedAlbumOptionalAttributes = "id" | "createDate";
 export type UnmatchedAlbumCreationAttributes = Optional<UnmatchedAlbumAttributes, UnmatchedAlbumOptionalAttributes>;
 
 export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlbumCreationAttributes> implements UnmatchedAlbumAttributes {
-  id!: string;
   platformAlbumId!: string;
+  id!: string;
   createDate!: Date;
 
   // UnmatchedAlbum belongsTo PlatformAlbum via platformAlbumId
@@ -26,12 +26,6 @@ export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlb
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UnmatchedAlbum {
     return UnmatchedAlbum.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformAlbumId: {
       type: DataTypes.UUID,
       allowNull: false,
@@ -41,6 +35,12 @@ export class UnmatchedAlbum extends Model<UnmatchedAlbumAttributes, UnmatchedAlb
       },
       field: 'platform_album_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UnmatchedArtist.ts

@@ -3,9 +3,9 @@ import { DataTypes, Model, Optional } from 'sequelize';
 import type { Platform, PlatformId } from './Platform';
 
 export interface UnmatchedArtistAttributes {
-  id: string;
   platformId: number;
   externalArtistId: number;
+  id: string;
   createDate: Date;
   updateDate: Date;
 }
@@ -16,9 +16,9 @@ export type UnmatchedArtistOptionalAttributes = "id" | "createDate" | "updateDat
 export type UnmatchedArtistCreationAttributes = Optional<UnmatchedArtistAttributes, UnmatchedArtistOptionalAttributes>;
 
 export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedArtistCreationAttributes> implements UnmatchedArtistAttributes {
-  id!: string;
   platformId!: number;
   externalArtistId!: number;
+  id!: string;
   createDate!: Date;
   updateDate!: Date;
 
@@ -30,12 +30,6 @@ export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedA
 
   static initModel(sequelize: Sequelize.Sequelize): typeof UnmatchedArtist {
     return UnmatchedArtist.init({
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
-      primaryKey: true
-    },
     platformId: {
       type: DataTypes.SMALLINT,
       allowNull: false,
@@ -50,6 +44,12 @@ export class UnmatchedArtist extends Model<UnmatchedArtistAttributes, UnmatchedA
       allowNull: false,
       field: 'external_artist_id'
     },
+    id: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: Sequelize.Sequelize.fn('uuid_generate_v1'),
+      primaryKey: true
+    },
     createDate: {
       type: DataTypes.DATE,
       allowNull: false,

package/models/UserContacts.ts

@@ -4,7 +4,6 @@ import type { AppUser, AppUserId } from './AppUser';
 
 export interface UserContactsAttributes {
   appUserId: string;
-  contactId: string;
   contactAppUserId?: string;
   firstName?: string;
   lastName?: string;
@@ -18,16 +17,16 @@ export interface UserContactsAttributes {
   contactPhone3?: string;
   contactPhone3Type?: "mobile" | "work" | "home" | "main";
   active?: boolean;
+  contactId: string;
 }
 
 export type UserContactsPk = "contactId";
 export type UserContactsId = UserContacts[UserContactsPk];
-export type UserContactsOptionalAttributes = "contactId" | "contactAppUserId" | "firstName" | "lastName" | "contactEmail1" | "contactEmail2" | "contactEmail3" | "contactPhone1" | "contactPhone1Type" | "contactPhone2" | "contactPhone2Type" | "contactPhone3" | "contactPhone3Type" | "active";
+export type UserContactsOptionalAttributes = "contactAppUserId" | "firstName" | "lastName" | "contactEmail1" | "contactEmail2" | "contactEmail3" | "contactPhone1" | "contactPhone1Type" | "contactPhone2" | "contactPhone2Type" | "contactPhone3" | "contactPhone3Type" | "active" | "contactId";
 export type UserContactsCreationAttributes = Optional<UserContactsAttributes, UserContactsOptionalAttributes>;
 
 export class UserContacts extends Model<UserContactsAttributes, UserContactsCreationAttributes> implements UserContactsAttributes {
   appUserId!: string;
-  contactId!: string;
   contactAppUserId?: string;
   firstName?: string;
   lastName?: string;
@@ -41,6 +40,7 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
   contactPhone3?: string;
   contactPhone3Type?: "mobile" | "work" | "home" | "main";
   active?: boolean;
+  contactId!: string;
 
   // UserContacts belongsTo AppUser via appUserId
   appUser!: AppUser;
@@ -59,13 +59,6 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
       },
       field: 'app_user_id'
     },
-    contactId: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      defaultValue: DataTypes.UUIDV4,
-      primaryKey: true,
-      field: 'contact_id'
-    },
     contactAppUserId: {
       type: DataTypes.UUID,
       allowNull: true,
@@ -129,6 +122,13 @@ export class UserContacts extends Model<UserContactsAttributes, UserContactsCrea
     active: {
       type: DataTypes.BOOLEAN,
       allowNull: true
+    },
+    contactId: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      defaultValue: DataTypes.UUIDV4,
+      primaryKey: true,
+      field: 'contact_id'
     }
   }, {
     sequelize,

package/models/init-models.ts

@@ -638,8 +638,8 @@ export function initModels(sequelize: Sequelize) {
   PlatformUserAlbum.hasMany(PlatformUserAlbumTrack, { as: "platformUserAlbumTracks", foreignKey: "platformUserAlbumId"});
   PlatformUserPlaylistTrack.belongsTo(PlatformUserPlaylist, { as: "platformUserPlaylist", foreignKey: "platformUserPlaylistId"});
   PlatformUserPlaylist.hasMany(PlatformUserPlaylistTrack, { as: "platformUserPlaylistTracks", foreignKey: "platformUserPlaylistId"});
-  JukeboxQueueEntry.belongsTo(PlaybackStatus, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId"});
-  PlaybackStatus.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId"});
+  JukeboxQueueEntry.belongsTo(PlaybackStatusType, { as: "playbackStatusType", foreignKey: "playbackStatusTypeId"});
+  PlaybackStatusType.hasMany(JukeboxQueueEntry, { as: "jukeboxQueueEntries", foreignKey: "playbackStatusTypeId"});
   AppUser.belongsTo(State, { as: "state", foreignKey: "stateId"});
   State.hasMany(AppUser, { as: "appUsers", foreignKey: "stateId"});
   PlatformUserPlaylist.belongsTo(State, { as: "state", foreignKey: "stateId"});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earbug/db-models",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "main": "dist/init-models.js",
   "types": "dist/init-models.d.ts",
   "scripts": {