90dc-core 1.19.3 → 1.19.5

package/dist/lib/clients/ImagesClient.js

@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from "uuid";
 import { ExternalAPIError } from "../Errors/AppError.js";
 import { Log } from "../utils/Logger.js";
 import { validateBase64Image } from "../utils/imageValidation.js";
-import { UserProgressPhoto } from "../dbmodels/user/UserProgressPhoto.js";
+import { UserProgressPhoto } from "../dbmodels";
 const PROGRESS_DAYS = [
     1,
     30,

package/dist/lib/clients/ImagesClient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/clients/ImagesClient.ts"],"sourcesContent":["import admin from \"firebase-admin\";\nimport { Bucket } from \"@google-cloud/storage\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { ExternalAPIError } from \"../Errors/AppError.js\";\nimport { Log } from \"../utils/Logger.js\";\nimport { validateBase64Image } from \"../utils/imageValidation.js\";\nimport { UserProgressPhoto } from \"../dbmodels/user/UserProgressPhoto.js\";\nimport type * as t from \"./types/images.types.js\";\n\nconst PROGRESS_DAYS = [1, 30, 60, 90];\n\ntype RecipePhotoType = \"ingredients\" | \"cover\" | \"method\";\nconst RECIPE_PHOTO_TYPES: RecipePhotoType[] = [\"ingredients\", \"cover\", \"method\"];\n\nconst imageName = {\n  avatar: (userUuid: string) => `${userUuid}--avatar.png`,\n  progress: (userUuid: string, day: number, programId: string) => `${userUuid}--${day}day--${programId}.png`,\n  recipe: (recipeUuid: string, type: RecipePhotoType) => `${recipeUuid}--${type}.png`,\n};\n\nexport class ImagesClient {\n  private bucket: Bucket;\n  private logger = Log.getInstance().extend(\"images-client\");\n  private app: admin.app.App;\n\n  constructor(config: t.Config) {\n    if (config.firebaseApp) {\n      // Use provided Firebase app\n      this.app = config.firebaseApp;\n    } else {\n      // Initialize Firebase if needed (following FirebasePushNotificationClient pattern)\n      this.initializeApp(config.storageBucket);\n      this.app = admin.app();\n    }\n\n    this.bucket = this.app.storage().bucket(config.storageBucket);\n  }\n\n  private initializeApp(storageBucket: string): void {\n    try {\n      // Check if app already exists\n      if (admin.apps?.length && admin.apps.length > 0) {\n        this.logger.info(\"Using existing Firebase app\");\n        return;\n      }\n\n      // Try to load service account from environment (for local development)\n      const serviceAccountPath = process.env.FIREBASE_SERVICE_ACCOUNT_KEY;\n\n      if (serviceAccountPath) {\n        // Local development with service account file\n        const fs = require(\"fs\");\n        const serviceAccount = JSON.parse(fs.readFileSync(serviceAccountPath, \"utf-8\"));\n\n        admin.initializeApp({\n          credential: admin.credential.cert(serviceAccount),\n          storageBucket,\n        });\n\n        this.logger.info(\"Firebase initialized with service account file\", {\n          projectId: serviceAccount.project_id,\n          storageBucket,\n        });\n      } else {\n        // Production: use application default credentials\n        admin.initializeApp({\n          credential: admin.credential.applicationDefault(),\n          storageBucket,\n        });\n\n        this.logger.info(\"Firebase initialized with application default credentials\", {\n          storageBucket,\n        });\n      }\n    } catch (error) {\n      this.logger.error(\"Failed to initialize Firebase Admin SDK\", { error });\n      throw new ExternalAPIError(\n        \"Failed to initialize Firebase\",\n        `Error: ${String(error)}`\n      );\n    }\n  }\n\n  public async saveImage(base64: string, name: string): Promise<void> {\n    try {\n      this.logger.info(\"Saving image\", { name });\n\n      const buffer = this.base64ToBuffer(base64);\n      const file = this.bucket.file(name);\n      await file.save(buffer, { contentType: \"image/png\" });\n\n      this.logger.info(\"Image saved successfully\", { name });\n    } catch (error) {\n      this.handleError(error, \"saveImage\");\n    }\n  }\n\n  public async getImage(name: string): Promise<string | undefined> {\n    try {\n      this.logger.info(\"Getting image\", { name });\n\n      const file = this.bucket.file(name);\n      const [exists] = await file.exists();\n      if (!exists) {\n        return undefined;\n      }\n\n      const [contents] = await file.download();\n      return \"data:image/jpeg;base64,\" + contents.toString(\"base64\");\n    } catch (error) {\n      this.logger.error(`Failed to get image: ${name}`, { error });\n      return undefined;\n    }\n  }\n\n  public async saveAvatar(userUuid: string, base64: string): Promise<void> {\n    await this.saveImage(base64, imageName.avatar(userUuid));\n  }\n\n  public async getAvatar(userUuid: string): Promise<string | undefined> {\n    return this.getImage(imageName.avatar(userUuid));\n  }\n\n  public async saveProgressPhoto(userUuid: string, day: number, programId: string, base64: string): Promise<void> {\n    await this.saveImage(base64, imageName.progress(userUuid, day, programId));\n  }\n\n  public async getProgressPhotos(userUuid: string, programId: string): Promise<t.ProgressPhoto[]> {\n    const photos: t.ProgressPhoto[] = [];\n\n    for (const day of PROGRESS_DAYS) {\n      const base64 = await this.getImage(imageName.progress(userUuid, day, programId));\n      if (base64) {\n        photos.push({ day, base64 });\n      }\n    }\n\n    return photos;\n  }\n\n  public async saveRecipePhotos(input: t.SaveRecipePhotosInput): Promise<void> {\n    await Promise.all([\n      this.saveImage(input.ingredientBase64, imageName.recipe(input.recipeUuid, \"ingredients\")),\n      this.saveImage(input.coverBase64, imageName.recipe(input.recipeUuid, \"cover\")),\n      this.saveImage(input.methodBase64, imageName.recipe(input.recipeUuid, \"method\")),\n    ]);\n  }\n\n  public async getRecipePhotos(recipeUuid: string): Promise<t.RecipePhotos | undefined> {\n    const results = await Promise.all(\n      RECIPE_PHOTO_TYPES.map((type) => this.getImage(imageName.recipe(recipeUuid, type)))\n    );\n\n    if (results.every((r) => !r)) {\n      return undefined;\n    }\n\n    // BUG: cover/method swapped — preserved from original ImageController.ts to keep backward compat with frontend\n    return {\n      ingredientBase64: results[0] ?? \"\",\n      methodBase64: results[1] ?? \"\",\n      coverBase64: results[2] ?? \"\",\n    };\n  }\n\n  public async saveUserProgressPhoto(\n    input: t.UserProgressPhotoInput\n  ): Promise<t.UserProgressPhotoRecord> {\n    // Validate image\n    validateBase64Image(input.base64);\n\n    // Generate UUID for the photo\n    const uuid = uuidv4();\n\n    // Prepare Firebase path\n    const firebasePath = `progress-pictures/${input.userUuid}/${uuid}.png`;\n\n    // Upload to Firebase Storage\n    const base64Data = input.base64.replace(/^data:image\\/\\w+;base64,/, \"\");\n    const buffer = Buffer.from(base64Data, \"base64\");\n\n    const file = this.bucket.file(firebasePath);\n    await file.save(buffer, {\n      metadata: {\n        contentType: \"image/png\",\n      },\n    });\n\n    // Save metadata to database\n    const photoDate = input.photoDate || new Date();\n    const record = await UserProgressPhoto.create({\n      uuid,\n      userUuid: input.userUuid,\n      firebasePath,\n      photoDate,\n      programId: input.programId || null,\n    });\n\n    return record.toJSON() as t.UserProgressPhotoRecord;\n  }\n\n  async getUserProgressPhotos(\n    userUuid: string\n  ): Promise<t.UserProgressPhotoRecord[]> {\n    const records = await UserProgressPhoto.findAll({\n      where: { userUuid },\n      order: [[\"photoDate\", \"DESC\"]],\n      raw: true,\n    });\n\n    return records as t.UserProgressPhotoRecord[];\n  }\n\n  async getProgressPhotosByProgram(\n    programId: string\n  ): Promise<t.UserProgressPhotoRecord[]> {\n    const records = await UserProgressPhoto.findAll({\n      where: { programId },\n      order: [[\"photoDate\", \"DESC\"]],\n      raw: true,\n    });\n\n    return records as t.UserProgressPhotoRecord[];\n  }\n\n  async updateProgressPhotoDate(\n    input: t.UpdateProgressPhotoDateInput\n  ): Promise<t.UserProgressPhotoRecord | null> {\n    const [affectedRows] = await UserProgressPhoto.update(\n      { photoDate: input.photoDate },\n      {\n        where: {\n          uuid: input.uuid,\n          userUuid: input.userUuid, // Ensure user owns the photo\n        },\n      }\n    );\n\n    if (affectedRows === 0) {\n      return null; // Photo not found or user doesn't own it\n    }\n\n    const updated = await UserProgressPhoto.findOne({\n      where: { uuid: input.uuid },\n      raw: true,\n    });\n\n    return updated as t.UserProgressPhotoRecord;\n  }\n\n  async deleteProgressPhoto(\n    uuid: string,\n    userUuid: string\n  ): Promise<boolean> {\n    // Find the photo to get the firebasePath\n    const photo = await UserProgressPhoto.findOne({\n      where: { uuid, userUuid },\n      raw: true,\n    });\n\n    if (!photo) {\n      return false; // Photo not found or user doesn't own it\n    }\n\n    // Delete from Firebase Storage\n    const file = this.bucket.file(photo.firebasePath);\n    try {\n      await file.delete();\n    } catch (error) {\n      // If file doesn't exist in storage, continue with database deletion\n      console.warn(`Failed to delete file from storage: ${photo.firebasePath}`, error);\n    }\n\n    // Delete from database\n    await UserProgressPhoto.destroy({\n      where: { uuid, userUuid },\n    });\n\n    return true;\n  }\n\n  private base64ToBuffer(base64: string): Buffer {\n    const data = base64.includes(\",\") ? base64.split(\",\")[1]! : base64;\n    return Buffer.from(data, \"base64\");\n  }\n\n  private handleError(error: unknown, method: string): never {\n    this.logger.error(`Firebase Storage error in ${method}`, { error });\n    throw new ExternalAPIError(\n      `Firebase Storage error: ${error instanceof Error ? error.message : String(error)}`,\n      `Service: Firebase Storage, Method: ${method}`\n    );\n  }\n}\n"],"names":["admin","v4","uuidv4","ExternalAPIError","Log","validateBase64Image","UserProgressPhoto","PROGRESS_DAYS","RECIPE_PHOTO_TYPES","imageName","avatar","userUuid","progress","day","programId","recipe","recipeUuid","type","ImagesClient","bucket","logger","getInstance","extend","app","config","firebaseApp","initializeApp","storageBucket","storage","apps","length","info","serviceAccountPath","process","env","FIREBASE_SERVICE_ACCOUNT_KEY","fs","require","serviceAccount","JSON","parse","readFileSync","credential","cert","projectId","project_id","applicationDefault","error","String","saveImage","base64","name","buffer","base64ToBuffer","file","save","contentType","handleError","getImage","exists","undefined","contents","download","toString","saveAvatar","getAvatar","saveProgressPhoto","getProgressPhotos","photos","push","saveRecipePhotos","input","Promise","all","ingredientBase64","coverBase64","methodBase64","getRecipePhotos","results","map","every","r","saveUserProgressPhoto","uuid","firebasePath","base64Data","replace","Buffer","from","metadata","photoDate","Date","record","create","toJSON","getUserProgressPhotos","records","findAll","where","order","raw","getProgressPhotosByProgram","updateProgressPhotoDate","affectedRows","update","updated","findOne","deleteProgressPhoto","photo","delete","console","warn","destroy","data","includes","split","method","Error","message"],"mappings":"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"}
+{"version":3,"sources":["../../../src/lib/clients/ImagesClient.ts"],"sourcesContent":["import admin from \"firebase-admin\";\nimport { Bucket } from \"@google-cloud/storage\";\nimport { v4 as uuidv4 } from \"uuid\";\nimport { ExternalAPIError } from \"../Errors/AppError.js\";\nimport { Log } from \"../utils/Logger.js\";\nimport { validateBase64Image } from \"../utils/imageValidation.js\";\nimport { UserProgressPhoto } from \"../dbmodels/index.js\";\nimport type * as t from \"./types/images.types.js\";\n\nconst PROGRESS_DAYS = [1, 30, 60, 90];\n\ntype RecipePhotoType = \"ingredients\" | \"cover\" | \"method\";\nconst RECIPE_PHOTO_TYPES: RecipePhotoType[] = [\"ingredients\", \"cover\", \"method\"];\n\nconst imageName = {\n  avatar: (userUuid: string) => `${userUuid}--avatar.png`,\n  progress: (userUuid: string, day: number, programId: string) => `${userUuid}--${day}day--${programId}.png`,\n  recipe: (recipeUuid: string, type: RecipePhotoType) => `${recipeUuid}--${type}.png`,\n};\n\nexport class ImagesClient {\n  private bucket: Bucket;\n  private logger = Log.getInstance().extend(\"images-client\");\n  private app: admin.app.App;\n\n  constructor(config: t.Config) {\n    if (config.firebaseApp) {\n      // Use provided Firebase app\n      this.app = config.firebaseApp;\n    } else {\n      // Initialize Firebase if needed (following FirebasePushNotificationClient pattern)\n      this.initializeApp(config.storageBucket);\n      this.app = admin.app();\n    }\n\n    this.bucket = this.app.storage().bucket(config.storageBucket);\n  }\n\n  private initializeApp(storageBucket: string): void {\n    try {\n      // Check if app already exists\n      if (admin.apps?.length && admin.apps.length > 0) {\n        this.logger.info(\"Using existing Firebase app\");\n        return;\n      }\n\n      // Try to load service account from environment (for local development)\n      const serviceAccountPath = process.env.FIREBASE_SERVICE_ACCOUNT_KEY;\n\n      if (serviceAccountPath) {\n        // Local development with service account file\n        const fs = require(\"fs\");\n        const serviceAccount = JSON.parse(fs.readFileSync(serviceAccountPath, \"utf-8\"));\n\n        admin.initializeApp({\n          credential: admin.credential.cert(serviceAccount),\n          storageBucket,\n        });\n\n        this.logger.info(\"Firebase initialized with service account file\", {\n          projectId: serviceAccount.project_id,\n          storageBucket,\n        });\n      } else {\n        // Production: use application default credentials\n        admin.initializeApp({\n          credential: admin.credential.applicationDefault(),\n          storageBucket,\n        });\n\n        this.logger.info(\"Firebase initialized with application default credentials\", {\n          storageBucket,\n        });\n      }\n    } catch (error) {\n      this.logger.error(\"Failed to initialize Firebase Admin SDK\", { error });\n      throw new ExternalAPIError(\n        \"Failed to initialize Firebase\",\n        `Error: ${String(error)}`\n      );\n    }\n  }\n\n  public async saveImage(base64: string, name: string): Promise<void> {\n    try {\n      this.logger.info(\"Saving image\", { name });\n\n      const buffer = this.base64ToBuffer(base64);\n      const file = this.bucket.file(name);\n      await file.save(buffer, { contentType: \"image/png\" });\n\n      this.logger.info(\"Image saved successfully\", { name });\n    } catch (error) {\n      this.handleError(error, \"saveImage\");\n    }\n  }\n\n  public async getImage(name: string): Promise<string | undefined> {\n    try {\n      this.logger.info(\"Getting image\", { name });\n\n      const file = this.bucket.file(name);\n      const [exists] = await file.exists();\n      if (!exists) {\n        return undefined;\n      }\n\n      const [contents] = await file.download();\n      return \"data:image/jpeg;base64,\" + contents.toString(\"base64\");\n    } catch (error) {\n      this.logger.error(`Failed to get image: ${name}`, { error });\n      return undefined;\n    }\n  }\n\n  public async saveAvatar(userUuid: string, base64: string): Promise<void> {\n    await this.saveImage(base64, imageName.avatar(userUuid));\n  }\n\n  public async getAvatar(userUuid: string): Promise<string | undefined> {\n    return this.getImage(imageName.avatar(userUuid));\n  }\n\n  public async saveProgressPhoto(userUuid: string, day: number, programId: string, base64: string): Promise<void> {\n    await this.saveImage(base64, imageName.progress(userUuid, day, programId));\n  }\n\n  public async getProgressPhotos(userUuid: string, programId: string): Promise<t.ProgressPhoto[]> {\n    const photos: t.ProgressPhoto[] = [];\n\n    for (const day of PROGRESS_DAYS) {\n      const base64 = await this.getImage(imageName.progress(userUuid, day, programId));\n      if (base64) {\n        photos.push({ day, base64 });\n      }\n    }\n\n    return photos;\n  }\n\n  public async saveRecipePhotos(input: t.SaveRecipePhotosInput): Promise<void> {\n    await Promise.all([\n      this.saveImage(input.ingredientBase64, imageName.recipe(input.recipeUuid, \"ingredients\")),\n      this.saveImage(input.coverBase64, imageName.recipe(input.recipeUuid, \"cover\")),\n      this.saveImage(input.methodBase64, imageName.recipe(input.recipeUuid, \"method\")),\n    ]);\n  }\n\n  public async getRecipePhotos(recipeUuid: string): Promise<t.RecipePhotos | undefined> {\n    const results = await Promise.all(\n      RECIPE_PHOTO_TYPES.map((type) => this.getImage(imageName.recipe(recipeUuid, type)))\n    );\n\n    if (results.every((r) => !r)) {\n      return undefined;\n    }\n\n    // BUG: cover/method swapped — preserved from original ImageController.ts to keep backward compat with frontend\n    return {\n      ingredientBase64: results[0] ?? \"\",\n      methodBase64: results[1] ?? \"\",\n      coverBase64: results[2] ?? \"\",\n    };\n  }\n\n  public async saveUserProgressPhoto(\n    input: t.UserProgressPhotoInput\n  ): Promise<t.UserProgressPhotoRecord> {\n    // Validate image\n    validateBase64Image(input.base64);\n\n    // Generate UUID for the photo\n    const uuid = uuidv4();\n\n    // Prepare Firebase path\n    const firebasePath = `progress-pictures/${input.userUuid}/${uuid}.png`;\n\n    // Upload to Firebase Storage\n    const base64Data = input.base64.replace(/^data:image\\/\\w+;base64,/, \"\");\n    const buffer = Buffer.from(base64Data, \"base64\");\n\n    const file = this.bucket.file(firebasePath);\n    await file.save(buffer, {\n      metadata: {\n        contentType: \"image/png\",\n      },\n    });\n\n    // Save metadata to database\n    const photoDate = input.photoDate || new Date();\n    const record = await UserProgressPhoto.create({\n      uuid,\n      userUuid: input.userUuid,\n      firebasePath,\n      photoDate,\n      programId: input.programId || null,\n    });\n\n    return record.toJSON() as t.UserProgressPhotoRecord;\n  }\n\n  async getUserProgressPhotos(\n    userUuid: string\n  ): Promise<t.UserProgressPhotoRecord[]> {\n    const records = await UserProgressPhoto.findAll({\n      where: { userUuid },\n      order: [[\"photoDate\", \"DESC\"]],\n      raw: true,\n    });\n\n    return records as t.UserProgressPhotoRecord[];\n  }\n\n  async getProgressPhotosByProgram(\n    programId: string\n  ): Promise<t.UserProgressPhotoRecord[]> {\n    const records = await UserProgressPhoto.findAll({\n      where: { programId },\n      order: [[\"photoDate\", \"DESC\"]],\n      raw: true,\n    });\n\n    return records as t.UserProgressPhotoRecord[];\n  }\n\n  async updateProgressPhotoDate(\n    input: t.UpdateProgressPhotoDateInput\n  ): Promise<t.UserProgressPhotoRecord | null> {\n    const [affectedRows] = await UserProgressPhoto.update(\n      { photoDate: input.photoDate },\n      {\n        where: {\n          uuid: input.uuid,\n          userUuid: input.userUuid, // Ensure user owns the photo\n        },\n      }\n    );\n\n    if (affectedRows === 0) {\n      return null; // Photo not found or user doesn't own it\n    }\n\n    const updated = await UserProgressPhoto.findOne({\n      where: { uuid: input.uuid },\n      raw: true,\n    });\n\n    return updated as t.UserProgressPhotoRecord;\n  }\n\n  async deleteProgressPhoto(\n    uuid: string,\n    userUuid: string\n  ): Promise<boolean> {\n    // Find the photo to get the firebasePath\n    const photo = await UserProgressPhoto.findOne({\n      where: { uuid, userUuid },\n      raw: true,\n    });\n\n    if (!photo) {\n      return false; // Photo not found or user doesn't own it\n    }\n\n    // Delete from Firebase Storage\n    const file = this.bucket.file(photo.firebasePath);\n    try {\n      await file.delete();\n    } catch (error) {\n      // If file doesn't exist in storage, continue with database deletion\n      console.warn(`Failed to delete file from storage: ${photo.firebasePath}`, error);\n    }\n\n    // Delete from database\n    await UserProgressPhoto.destroy({\n      where: { uuid, userUuid },\n    });\n\n    return true;\n  }\n\n  private base64ToBuffer(base64: string): Buffer {\n    const data = base64.includes(\",\") ? base64.split(\",\")[1]! : base64;\n    return Buffer.from(data, \"base64\");\n  }\n\n  private handleError(error: unknown, method: string): never {\n    this.logger.error(`Firebase Storage error in ${method}`, { error });\n    throw new ExternalAPIError(\n      `Firebase Storage error: ${error instanceof Error ? error.message : String(error)}`,\n      `Service: Firebase Storage, Method: ${method}`\n    );\n  }\n}\n"],"names":["admin","v4","uuidv4","ExternalAPIError","Log","validateBase64Image","UserProgressPhoto","PROGRESS_DAYS","RECIPE_PHOTO_TYPES","imageName","avatar","userUuid","progress","day","programId","recipe","recipeUuid","type","ImagesClient","bucket","logger","getInstance","extend","app","config","firebaseApp","initializeApp","storageBucket","storage","apps","length","info","serviceAccountPath","process","env","FIREBASE_SERVICE_ACCOUNT_KEY","fs","require","serviceAccount","JSON","parse","readFileSync","credential","cert","projectId","project_id","applicationDefault","error","String","saveImage","base64","name","buffer","base64ToBuffer","file","save","contentType","handleError","getImage","exists","undefined","contents","download","toString","saveAvatar","getAvatar","saveProgressPhoto","getProgressPhotos","photos","push","saveRecipePhotos","input","Promise","all","ingredientBase64","coverBase64","methodBase64","getRecipePhotos","results","map","every","r","saveUserProgressPhoto","uuid","firebasePath","base64Data","replace","Buffer","from","metadata","photoDate","Date","record","create","toJSON","getUserProgressPhotos","records","findAll","where","order","raw","getProgressPhotosByProgram","updateProgressPhotoDate","affectedRows","update","updated","findOne","deleteProgressPhoto","photo","delete","console","warn","destroy","data","includes","split","method","Error","message"],"mappings":"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"}

package/dist/lib/dbmodels/user/UserProgressPhoto.js

@@ -26,7 +26,7 @@ _ts_decorate([
     })
 ], UserProgressPhoto.prototype, "userUuid", void 0);
 _ts_decorate([
-    BelongsTo(()=>PersistedUser)
+    BelongsTo(()=>PersistedUser, 'userUuid')
 ], UserProgressPhoto.prototype, "user", void 0);
 _ts_decorate([
     AllowNull(false),

package/dist/lib/dbmodels/user/UserProgressPhoto.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/dbmodels/user/UserProgressPhoto.ts"],"sourcesContent":["import {\n  Table,\n  Column,\n  Model,\n  DataType,\n  ForeignKey,\n  BelongsTo,\n  Default,\n  AllowNull,\n} from \"sequelize-typescript\";\nimport { PersistedUser } from \"./PersistedUser.js\";\n\n@Table({\n  tableName: \"UserProgressPhotos\",\n  timestamps: true,\n})\nexport class UserProgressPhoto extends Model {\n  @Default(DataType.UUIDV4)\n  @Column({\n    type: DataType.UUID,\n    defaultValue: DataType.UUID,\n    allowNull: false,\n    primaryKey: true,\n  })\n  declare uuid: string;\n\n  @ForeignKey(() => PersistedUser)\n  @AllowNull(false)\n  @Column({\n    type: DataType.UUID,\n    allowNull: false,\n  })\n  declare userUuid: string;\n\n  @BelongsTo(() => PersistedUser)\n  declare user: PersistedUser;\n\n  @AllowNull(false)\n  @Column({\n    type: DataType.STRING,\n    allowNull: false,\n  })\n  declare firebasePath: string;\n\n  @AllowNull(false)\n  @Column({\n    type: DataType.DATE,\n    allowNull: false,\n  })\n  declare photoDate: Date;\n\n  @AllowNull(true)\n  @Column({\n    type: DataType.UUID,\n    allowNull: true,\n  })\n  declare programId: string | null;\n\n  declare createdAt: Date;\n  declare updatedAt: Date;\n}\n"],"names":["Table","Column","Model","DataType","ForeignKey","BelongsTo","Default","AllowNull","PersistedUser","UserProgressPhoto","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","STRING","DATE","tableName","timestamps"],"mappings":";;;;;;AAAA,SACEA,KAAK,EACLC,MAAM,EACNC,KAAK,EACLC,QAAQ,EACRC,UAAU,EACVC,SAAS,EACTC,OAAO,EACPC,SAAS,QACJ,uBAAuB;AAC9B,SAASC,aAAa,QAAQ,qBAAqB;AAMnD,OAAO,MAAMC,0BAA0BP;AA4CvC;;qBA3CoBQ;;QAEhBC,MAAMR,SAASS,IAAI;QACnBC,cAAcV,SAASS,IAAI;QAC3BE,WAAW;QACXC,YAAY;;;;mBAIIP;;;QAGhBG,MAAMR,SAASS,IAAI;QACnBE,WAAW;;;;kBAIIN;;;;;QAKfG,MAAMR,SAASa,MAAM;QACrBF,WAAW;;;;;;QAMXH,MAAMR,SAASc,IAAI;QACnBH,WAAW;;;;;;QAMXH,MAAMR,SAASS,IAAI;QACnBE,WAAW;;;;;QAzCbI,WAAW;QACXC,YAAY"}
+{"version":3,"sources":["../../../../src/lib/dbmodels/user/UserProgressPhoto.ts"],"sourcesContent":["import {\n  Table,\n  Column,\n  Model,\n  DataType,\n  ForeignKey,\n  BelongsTo,\n  Default,\n  AllowNull,\n} from \"sequelize-typescript\";\nimport { PersistedUser } from \"./PersistedUser.js\";\n\n@Table({\n  tableName: \"UserProgressPhotos\",\n  timestamps: true,\n})\nexport class UserProgressPhoto extends Model {\n  @Default(DataType.UUIDV4)\n  @Column({\n    type: DataType.UUID,\n    defaultValue: DataType.UUID,\n    allowNull: false,\n    primaryKey: true,\n  })\n  declare uuid: string;\n\n  @ForeignKey(() => PersistedUser)\n  @AllowNull(false)\n  @Column({\n    type: DataType.UUID,\n    allowNull: false,\n  })\n  declare userUuid: string;\n\n  @BelongsTo(() => PersistedUser, 'userUuid')\n  declare user: PersistedUser;\n\n  @AllowNull(false)\n  @Column({\n    type: DataType.STRING,\n    allowNull: false,\n  })\n  declare firebasePath: string;\n\n  @AllowNull(false)\n  @Column({\n    type: DataType.DATE,\n    allowNull: false,\n  })\n  declare photoDate: Date;\n\n  @AllowNull(true)\n  @Column({\n    type: DataType.UUID,\n    allowNull: true,\n  })\n  declare programId: string | null;\n\n  declare createdAt: Date;\n  declare updatedAt: Date;\n}\n"],"names":["Table","Column","Model","DataType","ForeignKey","BelongsTo","Default","AllowNull","PersistedUser","UserProgressPhoto","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","STRING","DATE","tableName","timestamps"],"mappings":";;;;;;AAAA,SACEA,KAAK,EACLC,MAAM,EACNC,KAAK,EACLC,QAAQ,EACRC,UAAU,EACVC,SAAS,EACTC,OAAO,EACPC,SAAS,QACJ,uBAAuB;AAC9B,SAASC,aAAa,QAAQ,qBAAqB;AAMnD,OAAO,MAAMC,0BAA0BP;AA4CvC;;qBA3CoBQ;;QAEhBC,MAAMR,SAASS,IAAI;QACnBC,cAAcV,SAASS,IAAI;QAC3BE,WAAW;QACXC,YAAY;;;;mBAIIP;;;QAGhBG,MAAMR,SAASS,IAAI;QACnBE,WAAW;;;;kBAIIN;;;;;QAKfG,MAAMR,SAASa,MAAM;QACrBF,WAAW;;;;;;QAMXH,MAAMR,SAASc,IAAI;QACnBH,WAAW;;;;;;QAMXH,MAAMR,SAASS,IAAI;QACnBE,WAAW;;;;;QAzCbI,WAAW;QACXC,YAAY"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "90dc-core",
-  "version": "1.19.3",
+  "version": "1.19.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",