rename communities to federated_communities

backend/src/config/index.ts

@@ -12,7 +12,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0064-event_rename',
+  DB_VERSION: '0065-refactor_communities_table',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info

backend/src/federation/client/1_0/FederationClient.ts

@@ -1,14 +1,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 import { gql } from 'graphql-request'
 
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
-export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
+export async function requestGetPublicKey(
+  dbCom: DbFederatedCommunity,
+): Promise<string | undefined> {
   let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
   endpoint = `${endpoint}${dbCom.apiVersion}/`
   logger.info(`requestGetPublicKey with endpoint='${endpoint}'...`)

backend/src/federation/client/1_1/FederationClient.ts

@@ -1,14 +1,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 import { gql } from 'graphql-request'
 
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
-export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
+export async function requestGetPublicKey(
+  dbCom: DbFederatedCommunity,
+): Promise<string | undefined> {
   let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'
   endpoint = `${endpoint}${dbCom.apiVersion}/`
   logger.info(`requestGetPublicKey with endpoint='${endpoint}'...`)

backend/src/federation/validateCommunities.ts

@@ -1,5 +1,7 @@
+/** eslint-disable @typescript-eslint/no-unsafe-call */
+/** eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { IsNull } from '@dbTools/typeorm'
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 
 import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
@@ -23,13 +25,14 @@ export function startValidateCommunities(timerInterval: number): void {
 }
 
 export async function validateCommunities(): Promise<void> {
-  const dbCommunities: DbCommunity[] = await DbCommunity.createQueryBuilder()
+  const dbFederatedCommunities: DbFederatedCommunity[] =
+    await DbFederatedCommunity.createQueryBuilder()
       .where({ foreign: true, verifiedAt: IsNull() })
       .orWhere('verified_at < last_announced_at')
       .getMany()
 
-  logger.debug(`Federation: found ${dbCommunities.length} dbCommunities`)
+  logger.debug(`Federation: found ${dbFederatedCommunities.length} dbCommunities`)
-  for (const dbCom of dbCommunities) {
+  for (const dbCom of dbFederatedCommunities) {
     logger.debug('Federation: dbCom', dbCom)
     const apiValueStrings: string[] = Object.values(ApiVersionType)
     logger.debug(`suppported ApiVersions=`, apiValueStrings)
@@ -46,7 +49,7 @@ export async function validateCommunities(): Promise<void> {
         )
         if (pubKey && pubKey === dbCom.publicKey.toString()) {
           logger.info(`Federation: matching publicKey:  ${pubKey}`)
-          await DbCommunity.update({ id: dbCom.id }, { verifiedAt: new Date() })
+          await DbFederatedCommunity.update({ id: dbCom.id }, { verifiedAt: new Date() })
           logger.debug(`Federation: updated dbCom:  ${JSON.stringify(dbCom)}`)
         } else {
           logger.warn(
@@ -74,7 +77,9 @@ function isLogError(err: unknown) {
   return err instanceof LogError
 }
 
-async function invokeVersionedRequestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
+async function invokeVersionedRequestGetPublicKey(
+  dbCom: DbFederatedCommunity,
+): Promise<string | undefined> {
   switch (dbCom.apiVersion) {
     case ApiVersionType.V1_0:
       return v1_0_requestGetPublicKey(dbCom)

backend/src/graphql/model/Community.ts

@@ -6,14 +6,12 @@ export class Community {
   constructor(dbCom: DbCommunity) {
     this.id = dbCom.id
     this.foreign = dbCom.foreign
-    this.publicKey = dbCom.publicKey.toString()
+    this.name = dbCom.name
-    this.url =
+    this.description = dbCom.description
-      (dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/') + dbCom.apiVersion
+    this.url = dbCom.url
-    this.lastAnnouncedAt = dbCom.lastAnnouncedAt
+    this.creationDate = dbCom.creationDate
-    this.verifiedAt = dbCom.verifiedAt
+    this.uuid = dbCom.communityUuid
-    this.lastErrorAt = dbCom.lastErrorAt
+    this.authenticatedAt = dbCom.authenticatedAt
-    this.createdAt = dbCom.createdAt
-    this.updatedAt = dbCom.updatedAt
   }
 
   @Field(() => Int)
@@ -22,24 +20,21 @@ export class Community {
   @Field(() => Boolean)
   foreign: boolean
 
-  @Field(() => String)
+  @Field(() => String, { nullable: true })
-  publicKey: string
+  name: string | null
+
+  @Field(() => String, { nullable: true })
+  description: string | null
 
   @Field(() => String)
   url: string
 
   @Field(() => Date, { nullable: true })
-  lastAnnouncedAt: Date | null
+  creationDate: Date |  null
+
+  @Field(() => String, { nullable: true })
+  uuid: string | null
 
   @Field(() => Date, { nullable: true })
-  verifiedAt: Date | null
+  authenticatedAt: Date | null
-
-  @Field(() => Date, { nullable: true })
-  lastErrorAt: Date | null
-
-  @Field(() => Date, { nullable: true })
-  createdAt: Date | null
-
-  @Field(() => Date, { nullable: true })
-  updatedAt: Date | null
 }

backend/src/graphql/model/FederatedCommunity.ts

@@ -0,0 +1,45 @@
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import { ObjectType, Field, Int } from 'type-graphql'
+
+@ObjectType()
+export class FederatedCommunity {
+  constructor(dbCom: DbFederatedCommunity) {
+    this.id = dbCom.id
+    this.foreign = dbCom.foreign
+    this.publicKey = dbCom.publicKey.toString()
+    this.url =
+      (dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/') + dbCom.apiVersion
+    this.lastAnnouncedAt = dbCom.lastAnnouncedAt
+    this.verifiedAt = dbCom.verifiedAt
+    this.lastErrorAt = dbCom.lastErrorAt
+    this.createdAt = dbCom.createdAt
+    this.updatedAt = dbCom.updatedAt
+  }
+
+  @Field(() => Int)
+  id: number
+
+  @Field(() => Boolean)
+  foreign: boolean
+
+  @Field(() => String)
+  publicKey: string
+
+  @Field(() => String)
+  url: string
+
+  @Field(() => Date, { nullable: true })
+  lastAnnouncedAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  verifiedAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  lastErrorAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  createdAt: Date | null
+
+  @Field(() => Date, { nullable: true })
+  updatedAt: Date | null
+}

backend/src/graphql/resolver/CommunityResolver.test.ts

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 
 import { testEnvironment } from '@test/helpers'
 
@@ -21,7 +21,7 @@ beforeAll(async () => {
   testEnv = await testEnvironment()
   query = testEnv.query
   con = testEnv.con
-  await DbCommunity.clear()
+  await DbFederatedCommunity.clear()
 })
 
 afterAll(async () => {
@@ -30,12 +30,12 @@ afterAll(async () => {
 
 describe('CommunityResolver', () => {
   describe('getCommunities', () => {
-    let homeCom1: DbCommunity
+    let homeCom1: DbFederatedCommunity
-    let homeCom2: DbCommunity
+    let homeCom2: DbFederatedCommunity
-    let homeCom3: DbCommunity
+    let homeCom3: DbFederatedCommunity
-    let foreignCom1: DbCommunity
+    let foreignCom1: DbFederatedCommunity
-    let foreignCom2: DbCommunity
+    let foreignCom2: DbFederatedCommunity
-    let foreignCom3: DbCommunity
+    let foreignCom3: DbFederatedCommunity
 
     describe('with empty list', () => {
       it('returns no community entry', async () => {
@@ -53,29 +53,29 @@ describe('CommunityResolver', () => {
       beforeEach(async () => {
         jest.clearAllMocks()
 
-        homeCom1 = DbCommunity.create()
+        homeCom1 = DbFederatedCommunity.create()
         homeCom1.foreign = false
         homeCom1.publicKey = Buffer.from('publicKey-HomeCommunity')
         homeCom1.apiVersion = '1_0'
         homeCom1.endPoint = 'http://localhost/api'
         homeCom1.createdAt = new Date()
-        await DbCommunity.insert(homeCom1)
+        await DbFederatedCommunity.insert(homeCom1)
 
-        homeCom2 = DbCommunity.create()
+        homeCom2 = DbFederatedCommunity.create()
         homeCom2.foreign = false
         homeCom2.publicKey = Buffer.from('publicKey-HomeCommunity')
         homeCom2.apiVersion = '1_1'
         homeCom2.endPoint = 'http://localhost/api'
         homeCom2.createdAt = new Date()
-        await DbCommunity.insert(homeCom2)
+        await DbFederatedCommunity.insert(homeCom2)
 
-        homeCom3 = DbCommunity.create()
+        homeCom3 = DbFederatedCommunity.create()
         homeCom3.foreign = false
         homeCom3.publicKey = Buffer.from('publicKey-HomeCommunity')
         homeCom3.apiVersion = '2_0'
         homeCom3.endPoint = 'http://localhost/api'
         homeCom3.createdAt = new Date()
-        await DbCommunity.insert(homeCom3)
+        await DbFederatedCommunity.insert(homeCom3)
       })
 
       it('returns 3 home-community entries', async () => {
@@ -125,29 +125,29 @@ describe('CommunityResolver', () => {
       beforeEach(async () => {
         jest.clearAllMocks()
 
-        foreignCom1 = DbCommunity.create()
+        foreignCom1 = DbFederatedCommunity.create()
         foreignCom1.foreign = true
         foreignCom1.publicKey = Buffer.from('publicKey-ForeignCommunity')
         foreignCom1.apiVersion = '1_0'
         foreignCom1.endPoint = 'http://remotehost/api'
         foreignCom1.createdAt = new Date()
-        await DbCommunity.insert(foreignCom1)
+        await DbFederatedCommunity.insert(foreignCom1)
 
-        foreignCom2 = DbCommunity.create()
+        foreignCom2 = DbFederatedCommunity.create()
         foreignCom2.foreign = true
         foreignCom2.publicKey = Buffer.from('publicKey-ForeignCommunity')
         foreignCom2.apiVersion = '1_1'
         foreignCom2.endPoint = 'http://remotehost/api'
         foreignCom2.createdAt = new Date()
-        await DbCommunity.insert(foreignCom2)
+        await DbFederatedCommunity.insert(foreignCom2)
 
-        foreignCom3 = DbCommunity.create()
+        foreignCom3 = DbFederatedCommunity.create()
         foreignCom3.foreign = true
         foreignCom3.publicKey = Buffer.from('publicKey-ForeignCommunity')
         foreignCom3.apiVersion = '1_2'
         foreignCom3.endPoint = 'http://remotehost/api'
         foreignCom3.createdAt = new Date()
-        await DbCommunity.insert(foreignCom3)
+        await DbFederatedCommunity.insert(foreignCom3)
       })
 
       it('returns 3 home community and 3 foreign community entries', async () => {

backend/src/graphql/resolver/CommunityResolver.ts

@@ -1,22 +1,38 @@
 import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
+import { Community } from '@model/Community'
 import { Resolver, Query, Authorized } from 'type-graphql'
 
-import { Community } from '@model/Community'
+import { FederatedCommunity } from '@model/FederatedCommunity'
+
 
 import { RIGHTS } from '@/auth/RIGHTS'
 
 @Resolver()
 export class CommunityResolver {
   @Authorized([RIGHTS.COMMUNITIES])
-  @Query(() => [Community])
+  @Query(() => [FederatedCommunity])
-  async getCommunities(): Promise<Community[]> {
+  async getCommunities(): Promise<FederatedCommunity[]> {
-    const dbCommunities: DbCommunity[] = await DbCommunity.find({
+    const dbFederatedCommunities: DbFederatedCommunity[] = await DbFederatedCommunity.find({
       order: {
         foreign: 'ASC',
         createdAt: 'DESC',
         lastAnnouncedAt: 'DESC',
       },
     })
+    return dbFederatedCommunities.map(
+      (dbCom: DbFederatedCommunity) => new FederatedCommunity(dbCom),
+    )
+  }
+
+  @Authorized([RIGHTS.COMMUNITIES])
+  @Query(() => [Community])
+  async getCommunitySelections(): Promise<Community[]> {
+    const dbCommunities: DbCommunity[] = await DbCommunity.find({
+      order: {
+        name: 'ASC',
+      },
+    })
     return dbCommunities.map((dbCom: DbCommunity) => new Community(dbCom))
   }
 }

database/entity/0065-refactor_communities_table/Community.ts

@@ -0,0 +1,60 @@
+import {
+  BaseEntity,
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  UpdateDateColumn,
+} from 'typeorm'
+
+@Entity('communities')
+export class Community extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ name: 'foreign', type: 'bool', nullable: false, default: true })
+  foreign: boolean
+
+  @Column({ name: 'url', length: 255, nullable: false })
+  url: string
+
+  @Column({ name: 'public_key', type: 'binary', length: 64, nullable: false })
+  publicKey: Buffer
+
+  @Column({
+    name: 'community_uuid',
+    type: 'char',
+    length: 36,
+    nullable: true,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  communityUuid: string | null
+
+  @Column({ name: 'authenticated_at', type: 'datetime', nullable: true })
+  authenticatedAt: Date | null
+
+  @Column({ name: 'name', type: 'varchar', length: 40, nullable: true })
+  name: string | null
+
+  @Column({ name: 'description', type: 'varchar', length: 255, nullable: true })
+  description: string | null
+
+  @CreateDateColumn({ name: 'creation_date', type: 'datetime', nullable: true })
+  creationDate: Date | null
+
+  @CreateDateColumn({
+    name: 'created_at',
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP(3)',
+    nullable: false,
+  })
+  createdAt: Date
+
+  @UpdateDateColumn({
+    name: 'updated_at',
+    type: 'datetime',
+    onUpdate: 'CURRENT_TIMESTAMP(3)',
+    nullable: true,
+  })
+  updatedAt: Date | null
+}

database/entity/0065-refactor_communities_table/FederatedCommunity.ts

@@ -0,0 +1,51 @@
+import {
+  BaseEntity,
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  UpdateDateColumn,
+} from 'typeorm'
+
+@Entity('federated_communities')
+export class FederatedCommunity extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ name: 'foreign', type: 'bool', nullable: false, default: true })
+  foreign: boolean
+
+  @Column({ name: 'public_key', type: 'binary', length: 64, default: null, nullable: true })
+  publicKey: Buffer
+
+  @Column({ name: 'api_version', length: 10, nullable: false })
+  apiVersion: string
+
+  @Column({ name: 'end_point', length: 255, nullable: false })
+  endPoint: string
+
+  @Column({ name: 'last_announced_at', type: 'datetime', nullable: true })
+  lastAnnouncedAt: Date | null
+
+  @Column({ name: 'verified_at', type: 'datetime', nullable: true })
+  verifiedAt: Date | null
+
+  @Column({ name: 'last_error_at', type: 'datetime', nullable: true })
+  lastErrorAt: Date | null
+
+  @CreateDateColumn({
+    name: 'created_at',
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP(3)',
+    nullable: false,
+  })
+  createdAt: Date
+
+  @UpdateDateColumn({
+    name: 'updated_at',
+    type: 'datetime',
+    onUpdate: 'CURRENT_TIMESTAMP(3)',
+    nullable: true,
+  })
+  updatedAt: Date | null
+}

database/entity/Community.ts

@@ -1 +1 @@
-export { Community } from './0060-update_communities_table/Community'
+export { Community } from './0065-refactor_communities_table/Community'

database/entity/FederatedCommunity.ts

@@ -0,0 +1 @@
+export { FederatedCommunity } from './0065-refactor_communities_table/FederatedCommunity'

database/entity/index.ts

@@ -10,6 +10,7 @@ import { Contribution } from './Contribution'
 import { Event } from './Event'
 import { ContributionMessage } from './ContributionMessage'
 import { Community } from './Community'
+import { FederatedCommunity } from './FederatedCommunity'
 
 export const entities = [
   Community,
@@ -17,6 +18,7 @@ export const entities = [
   ContributionLink,
   ContributionMessage,
   Event,
+  FederatedCommunity,
   LoginElopageBuys,
   LoginEmailOptIn,
   Migration,

database/migrations/0065-refactor_communities_table.ts

@@ -0,0 +1,37 @@
+/* MIGRATION TO CREATE THE FEDERATION COMMUNITY TABLES
+ *
+ * This migration creates the `community` and 'communityfederation' tables in the `apollo` database (`gradido_community`).
+ */
+
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(`RENAME TABLE communities TO federated_communities;`)
+  await queryFn(`
+    CREATE TABLE communities (
+      \`id\` int unsigned NOT NULL AUTO_INCREMENT,
+      \`foreign\` tinyint(4) NOT NULL DEFAULT 1,
+      \`url\` varchar(255) NOT NULL,
+      \`public_key\` binary(64) NOT NULL,
+      \`community_uuid\` char(36) NULL,
+      \`authenticated_at\` datetime(3) NULL,
+      \`name\` varchar(40) NULL,
+      \`description\` varchar(255) NULL,
+      \`creation_date\` datetime(3) NULL,
+      \`created_at\` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+      \`updated_at\` datetime(3),
+      PRIMARY KEY (id),
+      UNIQUE KEY url_key (url),
+      UNIQUE KEY uuid_key (community_uuid),
+      UNIQUE KEY public_key_key (public_key)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+  `)
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  // write downgrade logic as parameter of queryFn
+  await queryFn(`DROP TABLE communities;`)
+  await queryFn(`RENAME TABLE federated_communities TO communities;`)
+
+}

dht-node/src/config/index.ts

@@ -3,7 +3,7 @@ import dotenv from 'dotenv'
 dotenv.config()
 
 const constants = {
-  DB_VERSION: '0064-event_rename',
+  DB_VERSION: '0065-refactor_communities_table',
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',

dht-node/src/dht_node/index.test.ts

@@ -5,7 +5,7 @@ import { startDHT } from './index'
 import DHT from '@hyperswarm/dht'
 import CONFIG from '@/config'
 import { logger } from '@test/testSetup'
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 import { testEnvironment, cleanDB } from '@test/helpers'
 
 CONFIG.FEDERATION_DHT_SEED = '64ebcb0e3ad547848fef4197c6e2332f'
@@ -261,7 +261,7 @@ describe('federation', () => {
 
             describe('with receiving wrong but tolerated property data', () => {
               let jsonArray: any[]
-              let result: DbCommunity[] = []
+              let result: DbFederatedCommunity[] = []
               beforeAll(async () => {
                 jest.clearAllMocks()
                 jsonArray = [
@@ -277,7 +277,7 @@ describe('federation', () => {
                   },
                 ]
                 await socketEventMocks.data(Buffer.from(JSON.stringify(jsonArray)))
-                result = await DbCommunity.find({ foreign: true })
+                result = await DbFederatedCommunity.find({ foreign: true })
               })
 
               afterAll(async () => {
@@ -523,7 +523,7 @@ describe('federation', () => {
 
             describe('with receiving data of exact max allowed properties length', () => {
               let jsonArray: any[]
-              let result: DbCommunity[] = []
+              let result: DbFederatedCommunity[] = []
               beforeAll(async () => {
                 jest.clearAllMocks()
                 jsonArray = [
@@ -538,7 +538,7 @@ describe('federation', () => {
                   { api: 'toolong api', url: 'some valid url' },
                 ]
                 await socketEventMocks.data(Buffer.from(JSON.stringify(jsonArray)))
-                result = await DbCommunity.find({ foreign: true })
+                result = await DbFederatedCommunity.find({ foreign: true })
               })
 
               afterAll(async () => {
@@ -570,7 +570,7 @@ describe('federation', () => {
 
             describe('with receiving data of exact max allowed buffer length', () => {
               let jsonArray: any[]
-              let result: DbCommunity[] = []
+              let result: DbFederatedCommunity[] = []
               beforeAll(async () => {
                 jest.clearAllMocks()
                 jsonArray = [
@@ -592,7 +592,7 @@ describe('federation', () => {
                   },
                 ]
                 await socketEventMocks.data(Buffer.from(JSON.stringify(jsonArray)))
-                result = await DbCommunity.find({ foreign: true })
+                result = await DbFederatedCommunity.find({ foreign: true })
               })
 
               afterAll(async () => {
@@ -711,7 +711,7 @@ describe('federation', () => {
             })
 
             describe('with proper data', () => {
-              let result: DbCommunity[] = []
+              let result: DbFederatedCommunity[] = []
               beforeAll(async () => {
                 jest.clearAllMocks()
                 await socketEventMocks.data(
@@ -728,7 +728,7 @@ describe('federation', () => {
                     ]),
                   ),
                 )
-                result = await DbCommunity.find({ foreign: true })
+                result = await DbFederatedCommunity.find({ foreign: true })
               })
 
               afterAll(async () => {

dht-node/src/dht_node/index.ts

@@ -3,7 +3,7 @@
 import DHT from '@hyperswarm/dht'
 import { logger } from '@/server/logger'
 import CONFIG from '@/config'
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 
 const KEY_SECRET_SEEDBYTES = 32
 const getSeed = (): Buffer | null =>
@@ -31,7 +31,7 @@ export const startDHT = async (topic: string): Promise<void> => {
     logger.info(`keyPairDHT: publicKey=${keyPair.publicKey.toString('hex')}`)
     logger.debug(`keyPairDHT: secretKey=${keyPair.secretKey.toString('hex')}`)
 
-    const ownApiVersions = await writeHomeCommunityEnries(keyPair.publicKey)
+    const ownApiVersions = await writeFederatedHomeCommunityEnries(keyPair.publicKey)
     logger.info(`ApiList: ${JSON.stringify(ownApiVersions)}`)
 
     const node = new DHT({ keyPair })
@@ -92,9 +92,9 @@ export const startDHT = async (topic: string): Promise<void> => {
             }
             logger.debug(`upsert with variables=${JSON.stringify(variables)}`)
             // this will NOT update the updatedAt column, to distingue between a normal update and the last announcement
-            await DbCommunity.createQueryBuilder()
+            await DbFederatedCommunity.createQueryBuilder()
               .insert()
-              .into(DbCommunity)
+              .into(DbFederatedCommunity)
               .values(variables)
               .orUpdate({
                 conflict_target: ['id', 'publicKey', 'apiVersion'],
@@ -179,7 +179,7 @@ export const startDHT = async (topic: string): Promise<void> => {
   }
 }
 
-async function writeHomeCommunityEnries(pubKey: any): Promise<CommunityApi[]> {
+async function writeFederatedHomeCommunityEnries(pubKey: any): Promise<CommunityApi[]> {
   const homeApiVersions: CommunityApi[] = Object.values(ApiVersionType).map(function (apiEnum) {
     const comApi: CommunityApi = {
       api: apiEnum,
@@ -189,17 +189,17 @@ async function writeHomeCommunityEnries(pubKey: any): Promise<CommunityApi[]> {
   })
   try {
     // first remove privious existing homeCommunity entries
-    DbCommunity.createQueryBuilder().delete().where({ foreign: false }).execute()
+    DbFederatedCommunity.createQueryBuilder().delete().where({ foreign: false }).execute()
 
     homeApiVersions.forEach(async function (homeApi) {
-      const homeCom = new DbCommunity()
+      const homeCom = new DbFederatedCommunity()
       homeCom.foreign = false
       homeCom.apiVersion = homeApi.api
       homeCom.endPoint = homeApi.url
       homeCom.publicKey = pubKey.toString('hex')
 
       // this will NOT update the updatedAt column, to distingue between a normal update and the last announcement
-      await DbCommunity.insert(homeCom)
+      await DbFederatedCommunity.insert(homeCom)
       logger.info(`federation home-community inserted successfully: ${JSON.stringify(homeCom)}`)
     })
   } catch (err) {

federation/src/config/index.ts

@@ -11,7 +11,7 @@ Decimal.set({
 */
 
 const constants = {
-  DB_VERSION: '0064-event_rename',
+  DB_VERSION: '0065-refactor_communities_table',
   // DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info

federation/src/graphql/api/1_0/resolver/PublicKeyResolver.test.ts

@@ -2,7 +2,7 @@
 /* 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 { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 
 let query: any
 
@@ -13,7 +13,7 @@ beforeAll(async () => {
   const server = await createServer()
   con = server.con
   query = createTestClient(server.apollo).query
-  DbCommunity.clear()
+  DbFederatedCommunity.clear()
 })
 
 afterAll(async () => {
@@ -32,12 +32,12 @@ describe('PublicKeyResolver', () => {
 
   describe('getPublicKey', () => {
     beforeEach(async () => {
-      const homeCom = new DbCommunity()
+      const homeCom = new DbFederatedCommunity()
       homeCom.foreign = false
       homeCom.apiVersion = '1_0'
       homeCom.endPoint = 'endpoint-url'
       homeCom.publicKey = Buffer.from('homeCommunity-publicKey')
-      await DbCommunity.insert(homeCom)
+      await DbFederatedCommunity.insert(homeCom)
     })
 
     it('returns homeCommunity-publicKey', async () => {

federation/src/graphql/api/1_0/resolver/PublicKeyResolver.ts

@@ -1,7 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Query, Resolver } from 'type-graphql'
 import { federationLogger as logger } from '@/server/logger'
-import { Community as DbCommunity } from '@entity/Community'
+import { FederatedCommunity as DbFederatedCommunity } from '@entity/FederatedCommunity'
 import { GetPublicKeyResult } from '../model/GetPublicKeyResult'
 
 @Resolver()
@@ -10,7 +10,7 @@ export class PublicKeyResolver {
   @Query(() => GetPublicKeyResult)
   async getPublicKey(): Promise<GetPublicKeyResult> {
     logger.debug(`getPublicKey() via apiVersion=1_0 ...`)
-    const homeCom = await DbCommunity.findOneOrFail({
+    const homeCom = await DbFederatedCommunity.findOneOrFail({
       foreign: false,
       apiVersion: '1_0',
     })