feat: add album start and end dates for storage template

server/src/services/storage-template.service.ts

@@ -54,6 +54,10 @@ interface RenderMetadata {
   filename: string;
   extension: string;
   albumName: string | null;
+  albumCreatedAt: Date | null;
+  albumUpdatedAt: Date | null;
+  albumStartDate: Date | null;
+  albumEndDate: Date | null;
 }
 
 @Injectable()
@@ -99,6 +103,10 @@ export class StorageTemplateService extends BaseService {
         filename: 'IMG_123',
         extension: 'jpg',
         albumName: 'album',
+        albumCreatedAt: new Date(),
+        albumUpdatedAt: new Date(),
+        albumStartDate: new Date(),
+        albumEndDate: new Date()
       });
     } catch (error) {
       this.logger.warn(`Storage template validation failed: ${JSON.stringify(error)}`);
@@ -253,16 +261,32 @@ export class StorageTemplateService extends BaseService {
       }
 
       let albumName = null;
+      let albumCreatedAt = null;
+      let albumUpdatedAt = null;
+      let albumStartDate = null;
+      let albumEndDate = null;
       if (this.template.needsAlbum) {
         const albums = await this.albumRepository.getByAssetId(asset.ownerId, asset.id);
-        albumName = albums?.[0]?.albumName || null;
+        const album = albums?.[0];
+        if (album) {
+          const [metadata] = await this.albumRepository.getMetadataForIds([album.id])
+          albumName = album.albumName || null;
+          albumCreatedAt = album.createdAt || null;
+          albumUpdatedAt = album.updatedAt || null;
+          albumStartDate = metadata?.startDate || null;
+          albumEndDate = metadata?.endDate || null;
+        }
       }
 
       const storagePath = this.render(this.template.compiled, {
         asset,
         filename: sanitized,
         extension,
         albumName,
+        albumCreatedAt,
+        albumUpdatedAt,
+        albumStartDate,
+        albumEndDate,
       });
       const fullPath = path.normalize(path.join(rootPath, storagePath));
       let destination = `${fullPath}.${extension}`;
@@ -321,12 +345,12 @@ export class StorageTemplateService extends BaseService {
     return {
       raw: template,
       compiled: handlebar.compile(template, { knownHelpers: undefined, strict: true }),
-      needsAlbum: template.includes('{{album}}'),
+      needsAlbum: template.includes('album'),
     };
   }
 
   private render(template: HandlebarsTemplateDelegate<any>, options: RenderMetadata) {
-    const { filename, extension, asset, albumName } = options;
+    const { filename, extension, asset, albumName, albumCreatedAt, albumUpdatedAt, albumStartDate, albumEndDate } = options;
     const substitutions: Record<string, string> = {
       filename,
       ext: extension,
@@ -344,6 +368,13 @@ export class StorageTemplateService extends BaseService {
 
     for (const token of Object.values(storageTokens).flat()) {
       substitutions[token] = dt.toFormat(token);
+      if (albumName) {
+        // Use system time zone for album dates to ensure all assets get the exact same date.
+        substitutions["album-createdAt-" + token] = albumCreatedAt ? DateTime.fromJSDate(albumCreatedAt, { zone: systemTimeZone }).toFormat(token) : '';
+        substitutions["album-updatedAt-" + token] = albumUpdatedAt ? DateTime.fromJSDate(albumUpdatedAt, { zone: systemTimeZone }).toFormat(token) : '';
+        substitutions["album-startDate-" + token] = albumStartDate ? DateTime.fromJSDate(albumStartDate, { zone: systemTimeZone }).toFormat(token) : '';
+        substitutions["album-endDate-" + token] = albumEndDate ? DateTime.fromJSDate(albumEndDate, { zone: systemTimeZone }).toFormat(token) : '';
+      }
     }
 
     return template(substitutions).replaceAll(/\/{2,}/gm, '/');