fixup! Removed duplicate method for fetching default account

TryGhost · Jan 28, 2025 · d6db946 · d6db946
1 parent a419796
commit d6db946
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/src/account/account.service.integration.test.ts b/src/account/account.service.integration.test.ts
@@ -255,6 +255,15 @@ describe('AccountService', () => {
                 service.getDefaultAccountForSite(site),
             ).rejects.toThrow(`No user found for site: ${site.id}`);
         });
+
+        it('should throw an error if no account is found for a site user', async () => {
+            await service.createInternalAccount(site, 'account1');
+
+            await db('users').where({site_id: site.id}).del();
+            await expect(
+                service.getDefaultAccountForSite(site),
+            ).rejects.toThrow(`Default account not found for site: ${site.id}`);
+        });
     });
 
     describe('getFollowingAccounts', () => {

diff --git a/src/dispatchers.ts b/src/dispatchers.ts
@@ -714,10 +714,6 @@ export function createFollowersDispatcher(
         const siteDefaultAccount =
             await accountService.getDefaultAccountForSite(site);
 
-        if (!siteDefaultAccount) {
-            throw new Error(`Default account not found for site: ${site.id}`);
-        }
-
         const results = await accountService.getFollowerAccounts(
             siteDefaultAccount,
             {
@@ -766,10 +762,6 @@ export function createFollowersCounter(
         const siteDefaultAccount =
             await accountService.getDefaultAccountForSite(site);
 
-        if (!siteDefaultAccount) {
-            throw new Error(`Default account not found for site: ${site.id}`);
-        }
-
         return await accountService.getFollowerAccountsCount(
             siteDefaultAccount,
         );
@@ -870,10 +862,6 @@ export function createFollowingDispatcher(
         const siteDefaultAccount =
             await accountService.getDefaultAccountForSite(site);
 
-        if (!siteDefaultAccount) {
-            throw new Error(`Default account not found for site: ${site.id}`);
-        }
-
         const results = await accountService.getFollowingAccounts(
             siteDefaultAccount,
             {
@@ -916,10 +904,6 @@ export function createFollowingCounter(
         const siteDefaultAccount =
             await accountService.getDefaultAccountForSite(site);
 
-        if (!siteDefaultAccount) {
-            throw new Error(`Default account not found for site: ${site.id}`);
-        }
-
         return await accountService.getFollowingAccountsCount(
             siteDefaultAccount,
         );

diff --git a/src/http/api/accounts.ts b/src/http/api/accounts.ts
@@ -189,14 +189,6 @@ export function createGetAccountFollowsHandler(
         const siteDefaultAccount =
             await accountService.getDefaultAccountForSite(site);
 
-        if (!siteDefaultAccount) {
-            logger.error('Default account not found for site: {siteHost}', {
-                siteHost,
-            });
-
-            return new Response(null, { status: 404 });
-        }
-
         // Get follows accounts and paginate
         const queryNext = ctx.req.query('next') || '0';
         const offset = Number.parseInt(queryNext);