feat: アカウントのヘッダー/アバター画像の設定、設定解除ができるように

pkg/accounts/adaptor/controller/account.ts

@@ -1,7 +1,7 @@
 import type { z } from '@hono/zod-openapi';
 import { Option, Result } from '@mikuroxina/mini-fn';
 
-import type { MediumID } from '../../../drive/model/medium.js';
+import type { Medium, MediumID } from '../../../drive/model/medium.js';
 import type { AccountID, AccountName } from '../../model/account.js';
 import type { AccountFollow } from '../../model/follow.js';
 import type { AuthenticateService } from '../../service/authenticate.js';
@@ -38,8 +38,8 @@
   private readonly unFollowService: UnfollowService;
   private readonly fetchFollowService: FetchFollowService;
   private readonly resendTokenService: ResendVerifyTokenService;
   private readonly headerService: AccountHeaderService;
   private readonly avatarService: AccountAvatarService;
 
   constructor(args: {
     registerService: RegisterService;
@@ -67,8 +67,8 @@
     this.unFollowService = args.unFollowService;
     this.fetchFollowService = args.fetchFollowService;
     this.resendTokenService = args.resendTokenService;
     this.headerService = args.headerService;
     this.avatarService = args.avatarService;
   }
 
   async createAccount(
@@ -221,38 +221,38 @@
     if (Result.isErr(res)) {
       return res;
     }
     const account = Result.unwrap(res);
 
     const avatarRes = await this.avatarService.fetchByAccountID(
       account.getID(),
     );
     const headerRes = await this.headerService.fetchByAccountID(
       account.getID(),
     );
-    const avatar = Result.isOk(avatarRes)
-      ? Result.unwrap(avatarRes).getUrl()
-      : '';
-    const header = Result.isOk(headerRes)
-      ? Result.unwrap(headerRes).getUrl()
-      : '';
+    const avatar = Result.mapOr('')((avatarImage: Medium): string =>
+      avatarImage.getUrl(),
+    )(avatarRes);
+    const header = Result.mapOr('')((headerImage: Medium): string =>
+      headerImage.getUrl(),
+    )(headerRes);
 
     return Result.ok({
       id: account.getID(),
       email: account.getMail(),
       name: account.getName() as string,
       nickname: account.getNickname(),
       bio: account.getBio(),
       // ToDo: fill the following fields
       avatar: avatar,
       header: header,
       followed_count: 0,
       following_count: 0,
       note_count: 0,
       created_at: account.getCreatedAt(),
       role: account.getRole(),
       frozen: account.getFrozen(),
       status: account.getStatus(),
       silenced: account.getSilenced(),
     });
   }
 
@@ -263,38 +263,38 @@
     if (Result.isErr(res)) {
       return res;
     }
     const account = Result.unwrap(res);
 
     const avatarRes = await this.avatarService.fetchByAccountID(
       account.getID(),
     );
     const headerRes = await this.headerService.fetchByAccountID(
       account.getID(),
     );
-    const avatar = Result.isOk(avatarRes)
-      ? Result.unwrap(avatarRes).getUrl()
-      : '';
-    const header = Result.isOk(headerRes)
-      ? Result.unwrap(headerRes).getUrl()
-      : '';
+    const avatar = Result.mapOr('')((avatarImage: Medium): string =>
+      avatarImage.getUrl(),
+    )(avatarRes);
+    const header = Result.mapOr('')((headerImage: Medium): string =>
+      headerImage.getUrl(),
+    )(headerRes);
 
     return Result.ok({
       id: account.getID(),
       email: account.getMail(),
       name: account.getName() as string,
       nickname: account.getNickname(),
       bio: account.getBio(),
       // ToDo: fill the following fields
       avatar: avatar,
       header: header,
       followed_count: 0,
       following_count: 0,
       note_count: 0,
       created_at: account.getCreatedAt(),
       role: account.getRole(),
       frozen: account.getFrozen(),
       status: account.getStatus(),
       silenced: account.getSilenced(),
     });
   }
 
@@ -476,99 +476,79 @@
     );
   }
 
   async setAvatar(
     targetAccountName: string,
     actorID: string,
     medium: string,
   ): Promise<Result.Result<Error, void>> {
     const accountRes = await this.fetchService.fetchAccount(
       targetAccountName as AccountName,
     );
     if (Result.isErr(accountRes)) {
       return accountRes;
     }
     const account = Result.unwrap(accountRes);
 
-    const res = await this.avatarService.create(
+    return await this.avatarService.create(
       account.getID(),
       medium as MediumID,
       actorID as AccountID,
     );
-    if (Result.isErr(res)) {
-      return res;
-    }
-
-    return Result.ok(undefined);
   }
 
   async setHeader(
     targetAccountName: string,
     actorID: string,
     medium: string,
   ): Promise<Result.Result<Error, void>> {
     const accountRes = await this.fetchService.fetchAccount(
       targetAccountName as AccountName,
     );
     if (Result.isErr(accountRes)) {
       return accountRes;
     }
     const account = Result.unwrap(accountRes);
 
-    const res = await this.headerService.create(
+    return await this.headerService.create(
       account.getID(),
       medium as MediumID,
       actorID as AccountID,
     );
-    if (Result.isErr(res)) {
-      return res;
-    }
-
-    return Result.ok(undefined);
   }
 
   async unsetAvatar(
     targetAccountName: string,
     actorID: string,
   ): Promise<Result.Result<Error, void>> {
     const accountRes = await this.fetchService.fetchAccount(
       targetAccountName as AccountName,
     );
     if (Result.isErr(accountRes)) {
       return accountRes;
     }
     const account = Result.unwrap(accountRes);
 
-    const res = await this.avatarService.delete(
+    return await this.avatarService.delete(
       account.getID(),
       actorID as AccountID,
     );
-    if (Result.isErr(res)) {
-      return res;
-    }
-
-    return Result.ok(undefined);
   }
 
   async unsetHeader(
     targetAccountName: string,
     actorID: string,
   ): Promise<Result.Result<Error, void>> {
     const accountRes = await this.fetchService.fetchAccount(
       targetAccountName as AccountID,
     );
     if (Result.isErr(accountRes)) {
       return accountRes;
     }
     const account = Result.unwrap(accountRes);
 
-    const res = await this.headerService.delete(
+    return await this.headerService.delete(
       account.getID(),
       actorID as AccountID,
     );
-    if (Result.isErr(res)) {
-      return res;
-    }
-
-    return Result.ok(undefined);
   }
 }

pkg/accounts/model/repository.ts

@@ -63,6 +63,12 @@ export interface AccountFollowRepository {
 export const followRepoSymbol = Ether.newEtherSymbol<AccountFollowRepository>();
 
 export interface AccountAvatarRepository {
+  /**
+   * Set an avatar image to account.\
+   * NOTE: This method **WILL NOT** overwrite the existing avatar. (returns error)
+   * @param accountID
+   * @param mediumID
+   */
   create(
     accountID: AccountID,
     mediumID: MediumID,
@@ -74,6 +80,12 @@ export const accountAvatarRepoSymbol =
   Ether.newEtherSymbol<AccountAvatarRepository>();
 
 export interface AccountHeaderRepository {
+  /**
+   * Set a header image to account.\
+   * NOTE: This method **WILL NOT** overwrite the existing header. (returns error)
+   * @param accountID
+   * @param mediumID
+   */
   create(
     accountID: AccountID,
     mediumID: MediumID,

pkg/drive/service/fetch.ts

@@ -17,7 +17,9 @@ export class FetchMediaService {
     )(res);
   }
 
-  async fetchMediaByID(mediumID: MediumID) {
+  async fetchMediaByID(
+    mediumID: MediumID,
+  ): Promise<Result.Result<Error, Medium>> {
     const res = await this.mediaRepository.findById(mediumID);
     return Option.okOrElse(
       () => new MediaNotFoundError('Failed to fetch media', { cause: null }),