feat(server): lighter buckets

server/src/dtos/asset-response.dto.ts

@@ -13,6 +13,7 @@ import {
 import { TagResponseDto, mapTag } from 'src/dtos/tag.dto';
 import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { AssetStatus, AssetType } from 'src/enum';
+import { hexOrBufferToBase64 } from 'src/utils/bytes';
 import { mimeTypes } from 'src/utils/mime-types';
 
 export class SanitizedAssetResponseDto {
@@ -140,15 +141,6 @@ const mapStack = (entity: { stack?: Stack | null }) => {
   };
 };
 
-// if an asset is jsonified in the DB before being returned, its buffer fields will be hex-encoded strings
-export const hexOrBufferToBase64 = (encoded: string | Buffer) => {
-  if (typeof encoded === 'string') {
-    return Buffer.from(encoded.slice(2), 'hex').toString('base64');
-  }
-
-  return encoded.toString('base64');
-};
-
 export function mapAsset(entity: MapAsset, options: AssetMapOptions = {}): AssetResponseDto {
   const { stripMetadata = false, withStack = false } = options;
 

server/src/dtos/time-bucket.dto.ts

@@ -1,15 +1,11 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
+
+import { IsEnum, IsInt, IsString, Min } from 'class-validator';
 import { AssetOrder } from 'src/enum';
-import { TimeBucketSize } from 'src/repositories/asset.repository';
+import { TimeBucketAssets, TimelineStack } from 'src/services/timeline.service.types';
 import { Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
 
 export class TimeBucketDto {
-  @IsNotEmpty()
-  @IsEnum(TimeBucketSize)
-  @ApiProperty({ enum: TimeBucketSize, enumName: 'TimeBucketSize' })
-  size!: TimeBucketSize;
-
   @ValidateUUID({ optional: true })
   userId?: string;
 
@@ -46,12 +42,132 @@ export class TimeBucketDto {
 export class TimeBucketAssetDto extends TimeBucketDto {
   @IsString()
   timeBucket!: string;
+
+  @IsInt()
+  @Min(1)
+  @Optional()
+  page?: number;
+
+  @IsInt()
+  @Optional()
+  pageSize?: number;
 }
 
-export class TimeBucketResponseDto {
+export class TimelineStackResponseDto implements TimelineStack {
+  @ApiProperty()
+  id!: string;
+
+  @ApiProperty()
+  primaryAssetId!: string;
+
+  @ApiProperty()
+  assetCount!: number;
+}
+
+export class TimeBucketAssetResponseDto implements TimeBucketAssets {
+  @ApiProperty({ type: [String] })
+  id: string[] = [];
+
+  @ApiProperty({ type: [String] })
+  ownerId: string[] = [];
+
+  @ApiProperty()
+  ratio: number[] = [];
+
+  @ApiProperty()
+  isFavorite: number[] = [];
+
+  @ApiProperty()
+  isArchived: number[] = [];
+
+  @ApiProperty()
+  isTrashed: number[] = [];
+
+  @ApiProperty()
+  isImage: number[] = [];
+
+  @ApiProperty()
+  isVideo: number[] = [];
+
+  @ApiProperty({
+    type: 'array',
+    items: {
+      oneOf: [
+        {
+          type: 'string',
+        },
+        {
+          type: 'number',
+        },
+      ],
+    },
+  })
+  thumbhash: (string | number)[] = [];
+
+  @ApiProperty()
+  localDateTime: Date[] = [];
+
+  @ApiProperty({
+    type: 'array',
+    items: {
+      oneOf: [
+        {
+          type: 'string',
+        },
+        {
+          type: 'number',
+        },
+      ],
+    },
+  })
+  duration: (string | number)[] = [];
+
+  @ApiProperty({ type: [TimelineStackResponseDto] })
+  stack: (TimelineStackResponseDto | number)[] = [];
+
+  @ApiProperty({
+    type: 'array',
+    items: {
+      oneOf: [
+        {
+          type: 'string',
+        },
+        {
+          type: 'number',
+        },
+      ],
+    },
+  })
+  projectionType: (string | number)[] = [];
+
+  @ApiProperty({
+    type: 'array',
+    items: {
+      oneOf: [
+        {
+          type: 'string',
+        },
+        {
+          type: 'number',
+        },
+      ],
+    },
+  })
+  livePhotoVideoId: (string | number)[] = [];
+}
+
+export class TimeBucketsResponseDto {
   @ApiProperty({ type: 'string' })
   timeBucket!: string;
 
   @ApiProperty({ type: 'integer' })
   count!: number;
 }
+
+export class TimeBucketResponseDto {
+  @ApiProperty({ type: TimeBucketAssetResponseDto })
+  bucketAssets!: TimeBucketAssetResponseDto;
+
+  @ApiProperty()
+  hasNextPage!: boolean;
+}