lint cleanup and unit test changes to accommodate recent bug fixes

gengstrand · gengstrand · commit 5a63edd4d7f4 · 2025-02-17T14:17:05.000-08:00
diff --git a/server/feed16/src/app.module.ts b/server/feed16/src/app.module.ts
@@ -1,14 +1,17 @@
 import { Module } from '@nestjs/common';
 import { ParticipantApiController } from './participant/participant.controller';
 import { OutboundApiController } from './outbound/outbound.controller';
-import { ParticipantService, OutboundService, InboundService } from './participant/participant.service';
+import {
+  ParticipantService,
+  OutboundService,
+  InboundService,
+} from './participant/participant.service';
 import { OutboundService as OutboundSearchService } from './outbound/outbound.service';
 import { RedisModule } from './redis.module';
 import { SearchModule } from './elasticsearch.module';
 import { MySqlModule } from './mysql.module';
 import { ParticipantRepository } from './entity/participant';
 import { FriendRepository } from './entity/friend';
-import { TypeOrmModule } from '@nestjs/typeorm';
 import { participantProviders, friendProviders } from './database.providers';
 
 @Module({
@@ -17,12 +20,12 @@ import { participantProviders, friendProviders } from './database.providers';
   providers: [
     ...participantProviders,
     ...friendProviders,
-    ParticipantRepository, 
+    ParticipantRepository,
     FriendRepository,
-    OutboundService, 
-    InboundService, 
-    OutboundSearchService, 
-    ParticipantService, 
+    OutboundService,
+    InboundService,
+    OutboundSearchService,
+    ParticipantService,
   ],
 })
 export class AppModule {}
diff --git a/server/feed16/src/database.providers.ts b/server/feed16/src/database.providers.ts
@@ -1,4 +1,3 @@
-
 import { DataSource } from 'typeorm';
 import { Participant } from './entity/participant';
 import { Friend } from './entity/friend';
@@ -9,7 +8,7 @@ export const databaseProviders = [
     useFactory: async () => {
       const dataSource = new DataSource({
         type: 'mysql',
-        host: process.env["MYSQL_HOST"] ?? 'localhost',
+        host: process.env['MYSQL_HOST'] ?? 'localhost',
         port: 3306,
         username: 'feed',
         password: 'feed1234',
@@ -24,21 +23,21 @@ export const databaseProviders = [
 ];
 
 export const participantProviders = [
-    {
-        provide: 'PARTICIPANT_REPOSITORY',
-        useFactory: (dataSource: DataSource) => {
-            return dataSource.getRepository(Participant);
-        },
-        inject: ['feedDataSource'],
+  {
+    provide: 'PARTICIPANT_REPOSITORY',
+    useFactory: (dataSource: DataSource) => {
+      return dataSource.getRepository(Participant);
     },
+    inject: ['feedDataSource'],
+  },
 ];
 
 export const friendProviders = [
-    {
-        provide: 'FRIEND_REPOSITORY',
-        useFactory: (dataSource: DataSource) => {
-            return dataSource.getRepository(Friend);
-        },
-        inject: ['feedDataSource'],
+  {
+    provide: 'FRIEND_REPOSITORY',
+    useFactory: (dataSource: DataSource) => {
+      return dataSource.getRepository(Friend);
     },
+    inject: ['feedDataSource'],
+  },
 ];
diff --git a/server/feed16/src/elasticsearch.module.ts b/server/feed16/src/elasticsearch.module.ts
@@ -8,7 +8,7 @@ import { SearchService } from './search.service';
   imports: [
     ElasticsearchModule.registerAsync({
       useFactory: () => ({
-        node: `http://${process.env["SEARCH_HOST"] ?? 'localhost'}:9200`,
+        node: `http://${process.env['SEARCH_HOST'] ?? 'localhost'}:9200`,
         maxRetries: 10,
         requestTimeout: 60000,
         pingTimeout: 60000,
@@ -23,4 +23,4 @@ import { SearchService } from './search.service';
   providers: [SearchService],
   exports: [SearchService],
 })
-export class SearchModule {}
+export class SearchModule {}
diff --git a/server/feed16/src/entity/friend.ts b/server/feed16/src/entity/friend.ts
@@ -12,4 +12,4 @@ export class Friend {
 
   @Column({ name: 'ToParticipantID' })
   toParticipantId: number;
-}
+}
diff --git a/server/feed16/src/entity/participant.ts b/server/feed16/src/entity/participant.ts
@@ -1,7 +1,6 @@
 import { Entity, Column, PrimaryGeneratedColumn, Repository } from 'typeorm';
 
-export class ParticipantRepository extends Repository<Participant> {
-}
+export class ParticipantRepository extends Repository<Participant> {}
 
 @Entity('Participant')
 export class Participant {
@@ -10,4 +9,4 @@ export class Participant {
 
   @Column({ name: 'Moniker' })
   moniker: string;
-}
+}
diff --git a/server/feed16/src/mysql.module.ts b/server/feed16/src/mysql.module.ts
@@ -1,8 +1,4 @@
-
 import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { Friend } from './entity/friend';
-import { Participant } from './entity/participant';
 import { databaseProviders } from './database.providers';
 
 @Module({
diff --git a/server/feed16/src/outbound/outbound.controller.spec.ts b/server/feed16/src/outbound/outbound.controller.spec.ts
@@ -4,36 +4,38 @@ import { OutboundApiController } from './outbound.controller';
 import { OutboundService } from './outbound.service';
 
 describe('OutboundApiController', () => {
-    let appController: OutboundApiController | null = null;
-    
-    beforeEach(async () => {
-        const app: TestingModule = await Test.createTestingModule({
-            imports: [],
-            controllers: [OutboundApiController],
-            providers: [
+  let appController: OutboundApiController | null = null;
+
+  beforeEach(async () => {
+    const app: TestingModule = await Test.createTestingModule({
+      imports: [],
+      controllers: [OutboundApiController],
+      providers: [
+        {
+          provide: SearchService,
+          useValue: {
+            search: jest.fn().mockImplementation(() => {
+              return Promise.resolve([
                 {
-                    provide: SearchService,
-                    useValue: {
-                        search: jest.fn().mockImplementation(() => {
-                            return Promise.resolve([{
-                                sender: '/participant/1',
-                                subject: 'test subject',
-                                story: 'test story',
-                            }]);
-                        }),
-                    },
+                  sender: '/participant/1',
+                  subject: 'test subject',
+                  story: 'test story',
                 },
-                OutboundService,
-            ],
-        }).compile();
-    
-        appController = app.get<OutboundApiController>(OutboundApiController);
-    });
-    describe('search api', () => {
-        it('should return results from keyword search', async () => {
-            const result = await appController?.searchOutbound('test');
-            expect(result?.length).toBe(1);
-            expect(result).toEqual(['/participant/1']);
-        });
+              ]);
+            }),
+          },
+        },
+        OutboundService,
+      ],
+    }).compile();
+
+    appController = app.get<OutboundApiController>(OutboundApiController);
+  });
+  describe('search api', () => {
+    it('should return results from keyword search', async () => {
+      const result = await appController?.searchOutbound('test');
+      expect(result?.length).toBe(1);
+      expect(result).toEqual(['/participant/1']);
     });
-});
+  });
+});
diff --git a/server/feed16/src/outbound/outbound.controller.ts b/server/feed16/src/outbound/outbound.controller.ts
@@ -8,14 +8,18 @@ export class OutboundApiController {
   constructor(private readonly outboundService: OutboundService) {}
 
   @Get()
-  @ApiOperation({ summary: 'Retrieve participants who posted stories containing these keywords' })
+  @ApiOperation({
+    summary:
+      'Retrieve participants who posted stories containing these keywords',
+  })
   @ApiResponse({
     status: 200,
     description: 'Successful operation',
     type: [String],
   })
-  public async searchOutbound(@Query('keywords') keywords: string): Promise<string[]> {
+  public async searchOutbound(
+    @Query('keywords') keywords: string,
+  ): Promise<string[]> {
     return await this.outboundService.searchOutbound(keywords);
   }
-
-}
+}
diff --git a/server/feed16/src/outbound/outbound.service.ts b/server/feed16/src/outbound/outbound.service.ts
@@ -1,14 +1,15 @@
-import { Injectable, Inject, NotFoundException } from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 import { SearchService, SearchDocument } from '../search.service';
 
 @Injectable()
 export class OutboundService {
-    constructor(private readonly searchService: SearchService) {}
-    public async searchOutbound(keywords: string): Promise<string[]> {
-        const outbound: (SearchDocument | null)[] = await this.searchService.search(keywords);
-        if (!outbound) {
-            throw new NotFoundException(`no match for keywords: ${keywords}`);
-        }
-        return outbound.filter((doc) => doc !== null).map((doc) => doc.sender);
+  constructor(private readonly searchService: SearchService) {}
+  public async searchOutbound(keywords: string): Promise<string[]> {
+    const outbound: (SearchDocument | null)[] =
+      await this.searchService.search(keywords);
+    if (!outbound) {
+      throw new NotFoundException(`no match for keywords: ${keywords}`);
     }
-}
+    return outbound.filter((doc) => doc !== null).map((doc) => doc.sender);
+  }
+}
diff --git a/server/feed16/src/participant/participant.controller.spec.ts b/server/feed16/src/participant/participant.controller.spec.ts
@@ -1,8 +1,21 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { ParticipantApiController, Participant, Friend, Inbound, Outbound } from './participant.controller';
+import {
+  ParticipantApiController,
+  Participant,
+  Friend,
+  Inbound,
+  Outbound,
+} from './participant.controller';
 import { Friend as FriendEntity } from '../entity/friend';
 import { Participant as ParticipantEntity } from '../entity/participant';
-import { ParticipantService, OutboundService, InboundService, InboundModel, OutboundModel, ParticipantModel } from './participant.service';
+import {
+  ParticipantService,
+  OutboundService,
+  InboundService,
+  InboundModel,
+  OutboundModel,
+  ParticipantModel,
+} from './participant.service';
 import { SearchService } from '../search.service';
 
 describe('ParticipantApiController', () => {
@@ -23,8 +36,19 @@ describe('ParticipantApiController', () => {
     fe.toParticipantId = 2;
     const pm1: ParticipantModel = new ParticipantModel(1, 'Hello World!');
     const pm2: ParticipantModel = new ParticipantModel(2, 'foo bar');
-    const im: InboundModel = new InboundModel(pm1, pm2, nowAsDate, 'test subject', 'test story');
-    const om: OutboundModel = new OutboundModel(pm1, nowAsDate, 'test subject', 'test story');
+    const im: InboundModel = new InboundModel(
+      pm1,
+      pm2,
+      nowAsDate,
+      'test subject',
+      'test story',
+    );
+    const om: OutboundModel = new OutboundModel(
+      pm1,
+      nowAsDate,
+      'test subject',
+      'test story',
+    );
     const app: TestingModule = await Test.createTestingModule({
       imports: [],
       controllers: [ParticipantApiController],
@@ -38,17 +62,17 @@ describe('ParticipantApiController', () => {
           },
         },
         {
-          provide: 'ParticipantRepository',
+          provide: 'PARTICIPANT_REPOSITORY',
           useValue: {
             findOneBy: jest.fn().mockReturnValue(Promise.resolve(pe)),
             save: jest.fn().mockImplementation(() => {
               participantSaved++;
               return Promise.resolve(pe);
-            })
-          }
+            }),
+          },
         },
         {
-          provide: 'FriendRepository',
+          provide: 'FRIEND_REPOSITORY',
           useValue: {
             save: jest.fn().mockImplementation(() => {
               friendSaved++;
@@ -75,7 +99,7 @@ describe('ParticipantApiController', () => {
           useValue: {
             get: jest.fn().mockReturnValue(Promise.resolve([im])),
             save: jest.fn().mockImplementation(() => {
-              inboundSaved++;nowAsDate
+              inboundSaved++;
               return Promise.resolve(im);
             }),
           },
@@ -89,8 +113,7 @@ describe('ParticipantApiController', () => {
         },
         ParticipantService,
       ],
-    })
-    .compile();
+    }).compile();
 
     appController = app.get<ParticipantApiController>(ParticipantApiController);
   });
@@ -105,6 +128,7 @@ describe('ParticipantApiController', () => {
       const p: Participant = new Participant(1, 'Hello World!');
       const t: Participant | undefined = await appController?.addParticipant(p);
       expect(participantSaved).toBeGreaterThan(0);
+      expect(t).toStrictEqual(p);
     });
   });
   describe('friend', () => {
@@ -145,9 +169,12 @@ describe('ParticipantApiController', () => {
     });
     it('add should call underlying repository add', async () => {
       const p1: Participant = new Participant(1, 'Hello World!');
-      const p2: Participant = new Participant(2, 'foo bar');
-      const f: Friend = new Friend(1, p1.link, p2.link);
-      const o: Outbound = new Outbound(p1.link, nowAsDate, 'test subject', 'test story');
+      const o: Outbound = new Outbound(
+        p1.link,
+        nowAsDate,
+        'test subject',
+        'test story',
+      );
       const t: Outbound | undefined = await appController?.addOutbound(1, o);
       expect(outboundSaved).toBeGreaterThan(0);
       expect(inboundSaved).toBeGreaterThan(0);
diff --git a/server/feed16/src/participant/participant.controller.ts b/server/feed16/src/participant/participant.controller.ts
diff --git a/server/feed16/src/participant/participant.service.ts b/server/feed16/src/participant/participant.service.ts
diff --git a/server/feed16/src/redis.module.ts b/server/feed16/src/redis.module.ts
diff --git a/server/feed16/src/search.service.ts b/server/feed16/src/search.service.ts
