feat(api): implement db integration for /news/annotate api with user …

…id as null

src/api/routes/newsRoute.ts

@@ -103,7 +103,9 @@ const newsRoute: RouteType = (apiRouter) => {
 			);
 
 			try {
-				const result = await newsService.annotateNews(uniqueRequestId);
+				const {body} = req;
+
+				const result = await newsService.annotateNews(uniqueRequestId, body);
 
 				logger.debug(
 					uniqueRequestId,

src/constants/errors/newsServiceErrors.ts

@@ -1,13 +1,21 @@
 import {asTypeIServiceError} from "@customTypes/commonServiceTypes";
 
 const newsServiceError = asTypeIServiceError({
-	predictAnnotations: {
+	generic: {
 		NewsDoesNotExists: {
 			error: "NewsDoesNotExists",
 
 			message: "News doesn't exists",
 		},
 	},
+
+	annotateNews: {
+		InvalidAnnotation: {
+			error: "InvalidAnnotation",
+
+			message: "Invalid annotation options",
+		},
+	},
 });
 
 export {newsServiceError};

src/db/repositories/AnnotationsRepository.ts

@@ -41,4 +41,14 @@ export default class AnnotationsRepository {
 	async all(): Promise<iAnnotationModel[]> {
 		return this.db.any("SELECT * FROM annotations");
 	}
+
+	// Returns a single annotation by id;
+	async findById(id: string): Promise<iAnnotationModel | null> {
+		return this.db.oneOrNone("SELECT * FROM annotations WHERE id = $1", id);
+	}
+
+	// Returns multiple annotations by ids;
+	async findByIds(ids: string[]): Promise<iAnnotationModel[]> {
+		return this.db.any("SELECT * FROM annotations WHERE id IN ($1:csv)", [ids]);
+	}
 }

src/db/repositories/NewsAnnotationRepository.ts

@@ -67,4 +67,17 @@ export default class NewsAnnotationRepository {
 			userId,
 		});
 	}
+
+	// Add multiple news_annotation_map records, and returns the new objects;
+	async addMultiple(
+		newsAnnotationMapRecords: iNewsAnnotationMapModel[]
+	): Promise<iNewsAnnotationMapModel[]> {
+		return this.db.tx("add-multiple-news-annotation-map", async (t) => {
+			const queries = newsAnnotationMapRecords.map((record) => {
+				return t.none(sql.add, record);
+			});
+
+			return t.batch(queries);
+		});
+	}
 }

src/services/NewsService.ts

@@ -8,7 +8,10 @@ import {iGenericServiceResult} from "@customTypes/commonServiceTypes";
 import {httpStatusCodes} from "@customTypes/networkTypes";
 
 import {NullableString, StringArray} from "@customTypes/commonTypes";
-import {iNewsSubmissionDTO} from "@customTypes/appDataTypes/newsTypes";
+import {
+	iNewsAnnotationsInputDTO,
+	iNewsSubmissionDTO,
+} from "@customTypes/appDataTypes/newsTypes";
 import securityUtil from "@util/securityUtil";
 import {newsServiceError} from "@constants/errors/newsServiceErrors";
 import {DBTaskType} from "@db/repositories";
@@ -44,14 +47,61 @@ export default class NewsService {
 	}
 
 	public async annotateNews(
-		uniqueRequestId: NullableString
+		uniqueRequestId: NullableString,
+		annotationInputDTO: iNewsAnnotationsInputDTO
 	): Promise<iGenericServiceResult<null>> {
-		// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		return db.task("annotate-news", async (task) => {
-			logger.silly("Annotating the news");
+		return db.tx("annotate-news", async (transaction) => {
+			const {newsId, annotations} = annotationInputDTO;
+
+			logger.silly("Checking if news exists");
+			const newsRecord = await transaction.news.findById(newsId);
+
+			if (!newsRecord) {
+				return serviceUtil.buildResult(
+					false,
+					httpStatusCodes.CLIENT_ERROR_BAD_REQUEST,
+					uniqueRequestId,
+					newsServiceError.generic.NewsDoesNotExists
+				);
+			}
 
-			// await task.newsAnnotations.annotate();
-			console.log("hello");
+			// check if the annotations exists
+			logger.silly("Checking if annotations exists");
+			const annotationRecords = await transaction.annotations.findByIds(
+				annotations
+			);
+
+			if (annotationRecords.length !== annotations.length) {
+				return serviceUtil.buildResult(
+					false,
+					httpStatusCodes.CLIENT_ERROR_BAD_REQUEST,
+					uniqueRequestId,
+					newsServiceError.annotateNews.InvalidAnnotation
+				);
+			}
+
+			logger.silly("Inserting all annotations to annotation map table");
+			const newsAnnotationMapRecords = annotations.map((annotationId) => {
+				return {
+					id: securityUtil.generateUUID(),
+					newsId,
+					annotationId,
+					annotatedBy: "USER",
+					userId: null, // FIXME: Add userId from request
+				};
+			});
+
+			await transaction.batch(
+				newsAnnotationMapRecords.map((record) => {
+					return transaction.newsAnnotationMap.add(
+						record.id,
+						record.newsId,
+						record.annotationId,
+						record.annotatedBy,
+						record.userId
+					);
+				})
+			);
 
 			return serviceUtil.buildResult(
 				true,
@@ -68,17 +118,12 @@ export default class NewsService {
 	): Promise<iGenericServiceResult<{annotationIds: StringArray} | null>> {
 		return db.task("predict-annotation", async (task) => {
 			const newsRecord = await task.news.findById(newsId);
-			console.log(
-				"🚀 ~ file: NewsService.ts:52 ~ NewsService ~ returndb.task ~ newsRecord:",
-				newsRecord
-			);
-
 			if (!newsRecord) {
 				return serviceUtil.buildResult(
 					false,
 					httpStatusCodes.CLIENT_ERROR_BAD_REQUEST,
 					uniqueRequestId,
-					newsServiceError.predictAnnotations.NewsDoesNotExists
+					newsServiceError.generic.NewsDoesNotExists
 				);
 			}