Merge pull request #28 from RaenonX-DL/dev

v2.15.0-beta.3 Release
RaenonX-DL · Oct 2, 2021 · 1ce8daa · 1ce8daa
2 parents 52b6fd2 + 76055bb
commit 1ce8daa
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 76 deletions.
diff --git a/src/api-def b/src/api-def
diff --git a/src/endpoints/info/lookup/controller.test.ts b/src/endpoints/info/lookup/controller.test.ts
@@ -30,8 +30,6 @@ describe('Unit info lookup controller', () => {
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   const payloadDragon: DragonAnalysisPublishPayload = {
@@ -47,8 +45,6 @@ describe('Unit info lookup controller', () => {
     notes: 'dragonNotes',
     suitableCharacters: 'dragonChara',
     videos: 'dragonVideo',
-    story: 'dragonStory',
-    keywords: 'dragonKeyword',
   };
 
   const insert3Chara = async () => {

diff --git a/src/endpoints/info/lookup/controller.ts b/src/endpoints/info/lookup/controller.ts
@@ -38,7 +38,7 @@ export class UnitInfoLookupController {
    * @return {Promise<Array<UnitInfoLookupEntry>>} list of most recently modified analyses
    */
   static async getRecentlyModifiedAnalyses(
-    mongoClient: MongoClient, lang: SupportedLanguages, maxCount = 3,
+    mongoClient: MongoClient, lang: SupportedLanguages, maxCount = 9,
   ): Promise<Array<UnitInfoLookupEntry>> {
     return UnitInfoLookupController.getAnalysisInfo(mongoClient, lang, (cursor) => {
       return cursor

diff --git a/src/endpoints/info/lookup/landing/handler.test.ts b/src/endpoints/info/lookup/landing/handler.test.ts
@@ -34,8 +34,6 @@ describe(`[Server] GET ${ApiEndPoints.INFO_UNIT_LOOKUP_LANDING} - analysis looku
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   const payloadLookup: UnitInfoLookupLandingPayload = {
@@ -69,7 +67,12 @@ describe(`[Server] GET ${ApiEndPoints.INFO_UNIT_LOOKUP_LANDING} - analysis looku
       .toStrictEqual([10950101, 10950201]);
   });
 
-  it('returns at most 3 analyses', async () => {
+  it('returns at most 9 analyses', async () => {
+    await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10530401});
+    await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10530501});
+    await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10540102});
+    await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10540103});
+    await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10540201});
     await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10540401});
     await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10850401});
     await AnalysisController.publishCharaAnalysis(app.mongoClient, {...payloadPost, unitId: 10850302});
@@ -83,7 +86,9 @@ describe(`[Server] GET ${ApiEndPoints.INFO_UNIT_LOOKUP_LANDING} - analysis looku
     expect(json.code).toBe(ApiResponseCode.SUCCESS);
     expect(json.success).toBe(true);
     expect(Object.values(json.analyses).map((entry) => entry.unitId))
-      .toStrictEqual([10950101, 10950201, 10850302]);
+      .toStrictEqual([
+        10950101, 10950201, 10850302, 10850401, 10540401, 10540201, 10540103, 10540102, 10530501,
+      ]);
   });
 
   it('returns an empty result if no analyses exist yet', async () => {

diff --git a/src/endpoints/info/lookup/main/handler.test.ts b/src/endpoints/info/lookup/main/handler.test.ts
@@ -34,8 +34,6 @@ describe(`[Server] GET ${ApiEndPoints.INFO_UNIT_LOOKUP} - unit info lookup`, ()
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   const payloadList1: UnitInfoLookupPayload = {

diff --git a/src/endpoints/meta/post/handler.test.ts b/src/endpoints/meta/post/handler.test.ts
@@ -83,8 +83,6 @@ describe('Post meta EP', () => {
       }],
       tipsBuilds: 'tip1',
       videos: 'video1',
-      story: 'story1',
-      keywords: 'kw1',
     };
 
     beforeEach(async () => {
@@ -191,8 +189,6 @@ describe('Post meta EP', () => {
       }],
       tipsBuilds: 'tip1',
       videos: 'video1',
-      story: 'story1',
-      keywords: 'kw1',
     };
 
     beforeEach(async () => {

diff --git a/src/endpoints/post/analysis/character/edit/handler.test.ts b/src/endpoints/post/analysis/character/edit/handler.test.ts
@@ -39,8 +39,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_EDIT_CHARA} - edit a charac
     }],
     tipsBuilds: 'tip1',
     videos: 'video1',
-    story: 'story1',
-    keywords: 'kw1',
   };
 
   const payloadEdit: CharaAnalysisEditPayload = {

diff --git a/src/endpoints/post/analysis/character/publish/handler.test.ts b/src/endpoints/post/analysis/character/publish/handler.test.ts
@@ -40,8 +40,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_PUBLISH_CHARA} - publish ch
     }],
     tipsBuilds: 'tip1',
     videos: 'video1',
-    story: 'story1',
-    keywords: 'kw1',
   };
 
   const payload2: CharaAnalysisPublishPayload = {
@@ -168,8 +166,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_PUBLISH_CHARA} - publish ch
     ));
     expect(doc.tipsBuilds).toEqual(payload2.tipsBuilds);
     expect(doc.videos).toEqual(payload2.videos);
-    expect(doc.story).toEqual(payload2.story);
-    expect(doc.keywords).toEqual(payload2.keywords);
     expect(doc.datePublishedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.dateModifiedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.editNotes).toHaveLength(0);
@@ -201,8 +197,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_PUBLISH_CHARA} - publish ch
     ));
     expect(doc.tipsBuilds).toEqual(payload2.tipsBuilds);
     expect(doc.videos).toEqual(payload2.videos);
-    expect(doc.story).toEqual(payload2.story);
-    expect(doc.keywords).toEqual(payload2.keywords);
     expect(doc.datePublishedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.dateModifiedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.editNotes).toHaveLength(0);

diff --git a/src/endpoints/post/analysis/controller.character.test.ts b/src/endpoints/post/analysis/controller.character.test.ts
@@ -30,8 +30,6 @@ describe(`[Controller] ${AnalysisController.name} (Character)`, () => {
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   beforeAll(async () => {
@@ -74,8 +72,6 @@ describe(`[Controller] ${AnalysisController.name} (Character)`, () => {
     ]);
     expect(post.tipsBuilds).toBe('tips');
     expect(post.videos).toBe('video');
-    expect(post.story).toBe('story');
-    expect(post.keywords).toBe('keyword');
     // Weird syntax on checking the value is number - https://stackoverflow.com/a/56133391/11571888
     expect(post.datePublishedEpoch).toEqual(expect.any(Number));
     expect(post.dateModifiedEpoch).toEqual(expect.any(Number));
@@ -89,7 +85,7 @@ describe(`[Controller] ${AnalysisController.name} (Character)`, () => {
     await AnalysisController.publishCharaAnalysis(app.mongoClient, {
       ...payloadChara,
       lang: SupportedLanguages.EN,
-      keywords: 'kw-en',
+      passives: 'passive-en',
     });
 
     const postDoc = await CharaAnalysis.getCollection(app.mongoClient).findOne({
@@ -102,7 +98,7 @@ describe(`[Controller] ${AnalysisController.name} (Character)`, () => {
     expect(post.unitId).toBe(10950101);
     expect(post.summary).toBe('summary');
     expect(post.summonResult).toBe('summon');
-    expect(post.passives).toBe('passive');
+    expect(post.passives).toBe('passive-en');
     expect(post.normalAttacks).toBe('normal');
     expect(post.forceStrike).toBe('force');
     expect(post.skills.map((info) => info.toObject())).toStrictEqual([
@@ -115,8 +111,6 @@ describe(`[Controller] ${AnalysisController.name} (Character)`, () => {
     ]);
     expect(post.tipsBuilds).toBe('tips');
     expect(post.videos).toBe('video');
-    expect(post.story).toBe('story');
-    expect(post.keywords).toBe('kw-en');
   });
 
   it('publishes analyses in different languages and IDs', async () => {
@@ -183,8 +177,6 @@ describe(`[Controller] ${AnalysisController.name} (Character)`, () => {
     ]);
     expect(post.tipsBuilds).toBe('tips');
     expect(post.videos).toBe('video');
-    expect(post.story).toBe('story');
-    expect(post.keywords).toBe('keyword');
   });
 
   it('blocks publishing with non-existent unit ID', async () => {

diff --git a/src/endpoints/post/analysis/controller.dragon.test.ts b/src/endpoints/post/analysis/controller.dragon.test.ts
@@ -24,8 +24,6 @@ describe(`[Controller] ${AnalysisController.name} (Dragon)`, () => {
     notes: 'dragonNotes',
     suitableCharacters: 'dragonChara',
     videos: 'dragonVideo',
-    story: 'dragonStory',
-    keywords: 'dragonKeyword',
   };
 
   beforeAll(async () => {
@@ -61,8 +59,6 @@ describe(`[Controller] ${AnalysisController.name} (Dragon)`, () => {
     expect(post.notes).toBe('dragonNotes');
     expect(post.suitableCharacters).toBe('dragonChara');
     expect(post.videos).toBe('dragonVideo');
-    expect(post.story).toBe('dragonStory');
-    expect(post.keywords).toBe('dragonKeyword');
     // Weird syntax on checking the value is number - https://stackoverflow.com/a/56133391/11571888
     expect(post.datePublishedEpoch).toEqual(expect.any(Number));
     expect(post.dateModifiedEpoch).toEqual(expect.any(Number));
@@ -77,7 +73,7 @@ describe(`[Controller] ${AnalysisController.name} (Dragon)`, () => {
       ...payloadDragon,
       unitId: payloadDragon.unitId,
       lang: SupportedLanguages.EN,
-      keywords: 'kw-en',
+      passives: 'passive-en',
     });
 
     const postDoc = await DragonAnalysis.getCollection(app.mongoClient).findOne({
@@ -90,14 +86,12 @@ describe(`[Controller] ${AnalysisController.name} (Dragon)`, () => {
     expect(post.unitId).toBe(20040405);
     expect(post.summary).toBe('dragonSummary');
     expect(post.summonResult).toBe('dragonSummon');
-    expect(post.passives).toBe('dragonPassive');
+    expect(post.passives).toBe('passive-en');
     expect(post.normalAttacks).toBe('dragonNormal');
     expect(post.ultimate).toBe('dragonUltimate');
     expect(post.notes).toBe('dragonNotes');
     expect(post.suitableCharacters).toBe('dragonChara');
     expect(post.videos).toBe('dragonVideo');
-    expect(post.story).toBe('dragonStory');
-    expect(post.keywords).toBe('kw-en');
   });
 
   it('blocks publishing duplicated analysis and the content is unchanged', async () => {
@@ -125,8 +119,6 @@ describe(`[Controller] ${AnalysisController.name} (Dragon)`, () => {
     expect(post.notes).toBe('dragonNotes');
     expect(post.suitableCharacters).toBe('dragonChara');
     expect(post.videos).toBe('dragonVideo');
-    expect(post.story).toBe('dragonStory');
-    expect(post.keywords).toBe('dragonKeyword');
   });
 
   it('blocks publishing analysis with non-existent unit ID', async () => {

diff --git a/src/endpoints/post/analysis/controller.shared.test.ts b/src/endpoints/post/analysis/controller.shared.test.ts
@@ -34,8 +34,6 @@ describe(`[Controller] ${AnalysisController.name} (Shared / Read)`, () => {
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   beforeAll(async () => {

diff --git a/src/endpoints/post/analysis/controller.ts b/src/endpoints/post/analysis/controller.ts
@@ -63,8 +63,6 @@ class AnalysisGetResult extends PostGetResult<AnalysisDocument> {
       passives: this.post[UnitAnalysisDocumentKey.passives],
       normalAttacks: this.post[UnitAnalysisDocumentKey.normalAttacks],
       videos: this.post[UnitAnalysisDocumentKey.videos],
-      story: this.post[UnitAnalysisDocumentKey.story],
-      keywords: this.post[UnitAnalysisDocumentKey.keywords],
     };
 
     if (base.type === UnitType.CHARACTER) {

diff --git a/src/endpoints/post/analysis/dragon/edit/handler.test.ts b/src/endpoints/post/analysis/dragon/edit/handler.test.ts
@@ -34,8 +34,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_EDIT_DRAGON} - edit a drago
     notes: 'dragonNotes',
     suitableCharacters: 'dragonChara',
     videos: 'dragonVideo',
-    story: 'dragonStory',
-    keywords: 'dragonKeyword',
   };
 
   const payloadEdit: DragonAnalysisEditPayload = {

diff --git a/src/endpoints/post/analysis/dragon/publish/handler.test.ts b/src/endpoints/post/analysis/dragon/publish/handler.test.ts
@@ -35,8 +35,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_PUBLISH_DRAGON} - publish d
     notes: 'dragonNotes',
     suitableCharacters: 'dragonChara',
     videos: 'dragonVideo',
-    story: 'dragonStory',
-    keywords: 'dragonKeyword',
   };
 
   const payload2: DragonAnalysisPublishPayload = {
@@ -159,8 +157,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_PUBLISH_DRAGON} - publish d
     expect(doc.ultimate).toEqual(payload2.ultimate);
     expect(doc.notes).toEqual(payload2.notes);
     expect(doc.videos).toEqual(payload2.videos);
-    expect(doc.story).toEqual(payload2.story);
-    expect(doc.keywords).toEqual(payload2.keywords);
     expect(doc.datePublishedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.dateModifiedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.editNotes).toHaveLength(0);
@@ -188,8 +184,6 @@ describe(`[Server] POST ${ApiEndPoints.POST_ANALYSIS_PUBLISH_DRAGON} - publish d
     expect(doc.ultimate).toEqual(payload2.ultimate);
     expect(doc.notes).toEqual(payload2.notes);
     expect(doc.videos).toEqual(payload2.videos);
-    expect(doc.story).toEqual(payload2.story);
-    expect(doc.keywords).toEqual(payload2.keywords);
     expect(doc.datePublishedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.dateModifiedEpoch.valueOf() - Date.now()).toBeLessThanOrEqual(1000);
     expect(doc.editNotes).toHaveLength(0);

diff --git a/src/endpoints/post/analysis/model/unitAnalysis.ts b/src/endpoints/post/analysis/model/unitAnalysis.ts
@@ -14,8 +14,6 @@ export enum UnitAnalysisDocumentKey {
   passives = 'p',
   normalAttacks = 'na',
   videos = 'v',
-  story = 'st',
-  keywords = 'k',
 }
 
 export type UnitAnalysisDocument = PostDocumentBaseNoTitle & {
@@ -26,8 +24,6 @@ export type UnitAnalysisDocument = PostDocumentBaseNoTitle & {
   [UnitAnalysisDocumentKey.passives]: string,
   [UnitAnalysisDocumentKey.normalAttacks]: string,
   [UnitAnalysisDocumentKey.videos]: string,
-  [UnitAnalysisDocumentKey.story]: string,
-  [UnitAnalysisDocumentKey.keywords]: string,
 }
 
 export type UnitAnalysisConstructParams = PostConstructParamsNoTitle & {
@@ -38,8 +34,6 @@ export type UnitAnalysisConstructParams = PostConstructParamsNoTitle & {
   passives: string,
   normalAttacks: string,
   videos: string,
-  story: string,
-  keywords: string,
 }
 
 /**
@@ -53,8 +47,6 @@ export abstract class UnitAnalysis extends PostNoTitle {
   passives: string;
   normalAttacks: string;
   videos: string;
-  story: string;
-  keywords: string;
 
   /**
    * Construct a unit analysis data.
@@ -64,7 +56,7 @@ export abstract class UnitAnalysis extends PostNoTitle {
   protected constructor(params: UnitAnalysisConstructParams) {
     super(params);
 
-    const {type, unitId, summary, summonResult, passives, normalAttacks, videos, story, keywords} = params;
+    const {type, unitId, summary, summonResult, passives, normalAttacks, videos} = params;
 
     this.type = type;
     this.unitId = unitId;
@@ -73,8 +65,6 @@ export abstract class UnitAnalysis extends PostNoTitle {
     this.passives = passives;
     this.normalAttacks = normalAttacks;
     this.videos = videos;
-    this.story = story;
-    this.keywords = keywords;
   }
 
   /**
@@ -113,8 +103,6 @@ export abstract class UnitAnalysis extends PostNoTitle {
       passives: obj[UnitAnalysisDocumentKey.passives],
       normalAttacks: obj[UnitAnalysisDocumentKey.normalAttacks],
       videos: obj[UnitAnalysisDocumentKey.videos],
-      story: obj[UnitAnalysisDocumentKey.story],
-      keywords: obj[UnitAnalysisDocumentKey.keywords],
       editNotes: obj[EditableDocumentKey.editNotes].map((editNote) => EditNote.fromDocument(editNote)),
     };
   }
@@ -147,8 +135,6 @@ export abstract class UnitAnalysis extends PostNoTitle {
       [UnitAnalysisDocumentKey.passives]: this.passives,
       [UnitAnalysisDocumentKey.normalAttacks]: this.normalAttacks,
       [UnitAnalysisDocumentKey.videos]: this.videos,
-      [UnitAnalysisDocumentKey.story]: this.story,
-      [UnitAnalysisDocumentKey.keywords]: this.keywords,
     };
   }
 }
diff --git a/src/endpoints/post/analysis/shared/get/handler.test.ts b/src/endpoints/post/analysis/shared/get/handler.test.ts
@@ -42,8 +42,6 @@ describe(`[Server] GET ${ApiEndPoints.POST_ANALYSIS_GET} - get analysis`, () =>
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   beforeAll(async () => {

diff --git a/src/endpoints/post/analysis/shared/idCheck/handler.test.ts b/src/endpoints/post/analysis/shared/idCheck/handler.test.ts
@@ -38,8 +38,6 @@ describe(`[Server] GET ${ApiEndPoints.POST_ANALYSIS_ID_CHECK} - check analysis I
     }],
     tipsBuilds: 'tips',
     videos: 'video',
-    story: 'story',
-    keywords: 'keyword',
   };
 
   beforeAll(async () => {

diff --git a/test/data/resources b/test/data/resources
+0 −2		api/post/analysis/elements.ts
+374 −135		package-lock.json
+4 −4		package.json