cleanup

Author: benjamonnguyen

mobile/openapi/lib/model/tag_update_dto.dart

@@ -13766,6 +13766,7 @@
             "type": "string"
           },
           "name": {
+            "nullable": true,
             "type": "string"
           }
         },

open-api/immich-openapi-specs.json

@@ -1406,6 +1406,7 @@ export type TagBulkAssetsResponseDto = {
 };
 export type TagUpdateDto = {
     color?: string | null;
+    name?: string | null;
 };
 export type TimeBucketResponseDto = {
     count: number;

open-api/typescript-sdk/src/fetch-client.ts

@@ -19,7 +19,7 @@ export class TagCreateDto {
 export class TagUpdateDto {
   @IsString()
   @Optional({ emptyToNull: true, nullable: true })
-  name?: string;
+  name?: string | null;
 
   @Optional({ emptyToNull: true, nullable: true })
   @ValidateHexColor()

server/src/dtos/tag.dto.ts

@@ -1,6 +1,6 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
--- TagRepository.get
+-- TagRepository.getOne
 select
   "tags"."id",
   "tags"."value",
@@ -13,6 +13,19 @@ from
 where
   "id" = $1
 
+-- TagRepository.getMany
+select
+  "tags"."id",
+  "tags"."value",
+  "tags"."createdAt",
+  "tags"."updatedAt",
+  "tags"."color",
+  "tags"."parentId"
+from
+  "tags"
+where
+  "id" in $1
+
 -- TagRepository.getByValue
 select
   "tags"."id",
@@ -61,27 +74,46 @@ order by
   "value" asc
 
 -- TagRepository.create
+begin
 insert into
   "tags" ("userId", "color", "value")
 values
   ($1, $2, $3)
 returning
   *
+rollback
 
 -- TagRepository.update
+begin
 update "tags"
 set
-  "color" = $1
+  "value" = $1,
+  "color" = $2
 where
-  "id" = $2
+  "id" = $3
 returning
   *
+rollback
 
 -- TagRepository.delete
 delete from "tags"
 where
   "id" = $1
 
+-- TagRepository.deleteEmptyTags
+begin
+select
+  "tags"."id",
+  count("assets"."id") as "count"
+from
+  "assets"
+  inner join "tag_asset" on "tag_asset"."assetsId" = "assets"."id"
+  inner join "tags_closure" on "tags_closure"."id_descendant" = "tag_asset"."tagsId"
+  inner join "tags" on "tags"."id" = "tags_closure"."id_descendant"
+group by
+  "tags"."id"
+commit
+
 -- TagRepository.addAssetIds
 insert into
   "tag_asset" ("tagsId", "assetsId")
@@ -107,17 +139,3 @@ on conflict do nothing
 returning
   *
 rollback
-
--- TagRepository.deleteEmptyTags
-begin
-select
-  "tags"."id",
-  count("assets"."id") as "count"
-from
-  "assets"
-  inner join "tag_asset" on "tag_asset"."assetsId" = "assets"."id"
-  inner join "tags_closure" on "tags_closure"."id_descendant" = "tag_asset"."tagsId"
-  inner join "tags" on "tags"."id" = "tags_closure"."id_descendant"
-group by
-  "tags"."id"
-commit

server/src/queries/tag.repository.sql

@@ -77,8 +77,8 @@ export class TagRepository {
       if (dto.value) {
         // propagate value update downstream
         const descendantIds = await this.getDescendantIds(id);
-        const descendants = await this.getMany(descendantIds.filter(_id => _id !== id));
-        const childrenByParentId =  new Map<string, { id: string, value: string }[]>();
+        const descendants = await this.getMany(descendantIds.filter((_id) => _id !== id));
+        const childrenByParentId = new Map<string, { id: string; value: string }[]>();
         for (const descendant of descendants) {
           const parentId = descendant.parentId;
           if (parentId) {
@@ -89,7 +89,7 @@ export class TagRepository {
           }
         }
 
-        const queue: { id: string; value: string }[] = [{id, value: updated.value}];
+        const queue: { id: string; value: string }[] = [{ id, value: updated.value }];
         for (let i = 0; i < queue.length; i++) {
           const { id, value } = queue[i];
           const children = childrenByParentId.get(id) ?? [];
@@ -98,26 +98,26 @@ export class TagRepository {
             const item = { id: child.id, value: `${value}/${name}` };
             queue.push(item);
           }
-      }
+        }
 
-      const toUpdate = queue.slice(1);
-      if (toUpdate.length > 0) {
-        await sql`
+        const toUpdate = queue.slice(1);
+        if (toUpdate.length > 0) {
+          await sql`
           UPDATE tags
           SET value = updates.value
           FROM (
             VALUES
               ${sql.join(
-                toUpdate.map(u => sql`(${sql`${u.id}::uuid`}, ${u.value})`),
-                sql`, `
+                toUpdate.map((u) => sql`(${sql`${u.id}::uuid`}, ${u.value})`),
+                sql`, `,
               )}
           ) AS updates(id, value)
           WHERE tags.id = updates.id
         `.execute(tx);
-        };
+        }
       }
     });
-    
+
     return updated!;
   }
 
@@ -232,10 +232,10 @@ export class TagRepository {
       .where('id_ancestor', '=', ancestorId)
       .execute();
 
-    return results.map(r => r.id_descendant);
+    return results.map((r) => r.id_descendant);
   }
 
-  async updateTagClosures(tag: { id: string, parentId?: string | null }, tx: Transaction<DB>) {
+  async updateTagClosures(tag: { id: string; parentId?: string | null }, tx: Transaction<DB>) {
     // update closure table
     await tx
       .insertInto('tags_closure')

server/src/repositories/tag.repository.ts

@@ -113,6 +113,7 @@ describe(TagService.name, () => {
     it('should update a tag', async () => {
       mocks.access.tag.checkOwnerAccess.mockResolvedValue(new Set(['tag-1']));
       mocks.tag.update.mockResolvedValue(tagStub.colorCreate);
+      mocks.tag.getOne.mockResolvedValue(tagStub.tag);
       await expect(sut.update(authStub.admin, 'tag-1', { color: '#000000' })).resolves.toEqual(tagResponseStub.color1);
       expect(mocks.tag.update).toHaveBeenCalledWith('tag-1', { color: '#000000' });
     });

server/src/services/tag.service.spec.ts

@@ -68,9 +68,9 @@ export class TagService extends BaseService {
 
     let value;
     if (name) {
-      const parts = existing.value.split("/");
+      const parts = existing.value.split('/');
       parts[parts.length - 1] = name;
-      value = parts.join("/");
+      value = parts.join('/');
     }
 
     const tag = await this.tagRepository.update(id, { value, color });