diff --git a/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.test.ts b/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.test.ts
new file mode 100644
index 000000000..08657c330
--- /dev/null
+++ b/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.test.ts
@@ -0,0 +1,64 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '@/server/createServer'
+import { Community as DbCommunity } from '@entity/Community'
+import CONFIG from '@/config'
+
+let query: any
+
+// to do: We need a setup for the tests that closes the connection
+let con: any
+
+CONFIG.FEDERATION_API = '1_0'
+
+beforeAll(async () => {
+  const server = await createServer()
+  con = server.con
+  query = createTestClient(server.apollo).query
+  DbCommunity.clear()
+})
+
+afterAll(async () => {
+  await con.close()
+})
+
+describe('PublicCommunityInfoResolver', () => {
+  const getPublicCommunityInfoQuery = `
+    query {
+      getPublicCommunityInfo
+       {
+        name
+        description
+        createdAt
+        publicKey
+      }
+    }
+  `
+
+  describe('getPublicCommunityInfo', () => {
+    beforeEach(async () => {
+      const homeCom = new DbCommunity()
+      homeCom.foreign = false
+      homeCom.url = 'homeCommunity-url'
+      homeCom.name = 'Community-Name'
+      homeCom.description = 'Community-Description'
+      homeCom.createdAt = new Date()
+      homeCom.publicKey = Buffer.from('homeCommunity-publicKey')
+      await DbCommunity.insert(homeCom)
+    })
+
+    it('returns public CommunityInfo', async () => {
+      await expect(query({ query: getPublicCommunityInfoQuery })).resolves.toMatchObject({
+        data: {
+          getPublicCommunityInfo: {
+            name: 'Community-Name',
+            description: 'Community-Description',
+            createdAt: expect.any(Date),
+            publicKey: expect.stringMatching('homeCommunity-publicKey'),
+          },
+        },
+      })
+    })
+  })
+})
diff --git a/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.ts b/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.ts
index 3bd02e346..3076edd41 100644
--- a/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.ts
+++ b/federation/src/graphql/api/1_0/resolver/PublicCommunityInfoResolver.ts
@@ -10,13 +10,9 @@ export class PublicCommunityInfoResolver {
   @Query(() => GetPublicCommunityInfoResult)
   async getPublicCommunityInfo(): Promise<GetPublicCommunityInfoResult> {
     logger.debug(`getPublicCommunityInfo() via apiVersion=1_0 ...`)
-    const homeCom = await DbCommunity.findOneOrFail({ foreign: false })
+    const homeCom = await DbCommunity.findOneByOrFail({ foreign: false })
     const result = new GetPublicCommunityInfoResult(homeCom)
-    logger.info(
-      `getPublicCommunityInfo()-1_0... return publicInfo=${JSON.stringify(
-        result
-      )}`
-    )
+    logger.info(`getPublicCommunityInfo()-1_0... return publicInfo=${JSON.stringify(result)}`)
     return result
   }
 }