From c9b1fd7d32f4f8d73882e18d1af2ddbdab7869d5 Mon Sep 17 00:00:00 2001
From: zkldi <notzkldi@zkldi.com>
Date: Mon, 31 May 2021 19:11:41 +0100
Subject: [PATCH] split function calls in score-importing.ts

---
 .../score-importing/score-importing.ts        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/server/src/lib/score-import/framework/score-importing/score-importing.ts b/server/src/lib/score-import/framework/score-importing/score-importing.ts
index 7ebdb1862..13e0bd05a 100644
--- a/server/src/lib/score-import/framework/score-importing/score-importing.ts
+++ b/server/src/lib/score-import/framework/score-importing/score-importing.ts
@@ -20,7 +20,11 @@ import { CreateScoreID } from "./score-id";
 import db from "../../../../external/mongo/db";
 import { AppendLogCtx, KtLogger } from "../../../logger/logger";
 
-import { ConverterFunctionReturns, ConverterFunction } from "../../import-types/common/types";
+import {
+    ConverterFnReturnOrFailure,
+    ConverterFunction,
+    ConverterFnSuccessReturn,
+} from "../../import-types/common/types";
 import { DryScore } from "../common/types";
 import { OrphanScore } from "../orphans/orphans";
 
@@ -95,7 +99,7 @@ export async function ImportIterableDatapoint<D, C>(
     logger: KtLogger
 ): Promise<ImportProcessingInfo | null> {
     // Converter Function Return
-    let cfnReturn: ConverterFunctionReturns;
+    let cfnReturn: ConverterFnReturnOrFailure;
 
     try {
         cfnReturn = await ConverterFunction(data, context, importType, logger);
@@ -103,11 +107,6 @@ export async function ImportIterableDatapoint<D, C>(
         cfnReturn = err;
     }
 
-    // null => processing didnt result in a score document, but not an error, no processing needed!
-    if (cfnReturn === null) {
-        return null;
-    }
-
     // if this conversion failed, return it in the proper format
     if (cfnReturn instanceof ConverterFailure) {
         if (cfnReturn instanceof KTDataNotFoundFailure) {
@@ -181,6 +180,14 @@ export async function ImportIterableDatapoint<D, C>(
         };
     }
 
+    return ProcessSuccessfulConverterReturn(userID, cfnReturn as ConverterFnSuccessReturn, logger);
+}
+
+export async function ProcessSuccessfulConverterReturn(
+    userID: integer,
+    cfnReturn: ConverterFnSuccessReturn,
+    logger: KtLogger
+): Promise<ImportProcessingInfo | null> {
     const result = await HydrateAndInsertScore(
         userID,
         cfnReturn.dryScore,