🏗️ Refactored the searchIssue method

services/library.service.ts

@@ -33,7 +33,13 @@ SOFTWARE.
 
 "use strict";
 import { isNil } from "lodash";
-import { Context, Service, ServiceBroker, ServiceSchema, Errors } from "moleculer";
+import {
+	Context,
+	Service,
+	ServiceBroker,
+	ServiceSchema,
+	Errors,
+} from "moleculer";
 import { DbMixin } from "../mixins/db.mixin";
 import Comic from "../models/comic.model";
 import { walkFolder, getSizeOfDirectory } from "../utils/file.utils";
@@ -95,7 +101,9 @@ export default class ImportService extends Service {
 				uncompressFullArchive: {
 					rest: "POST /uncompressFullArchive",
 					params: {},
-					handler: async (ctx: Context<{ filePath: string; options: any }>) => {
+					handler: async (
+						ctx: Context<{ filePath: string; options: any }>
+					) => {
 						await broker.call("importqueue.uncompressResize", {
 							filePath: ctx.params.filePath,
 							options: ctx.params.options,
@@ -113,7 +121,8 @@ export default class ImportService extends Service {
 						});
 						// Determine source where the comic was added from
 						// and gather identifying information about it
-						const sourceName = referenceComicObject[0].acquisition.source.name;
+						const sourceName =
+							referenceComicObject[0].acquisition.source.name;
 						const { sourcedMetadata } = referenceComicObject[0];
 
 						const filePath = `${COMICS_DIRECTORY}/${ctx.params.bundle.data.name}`;
@@ -157,8 +166,14 @@ export default class ImportService extends Service {
 								// 1.1 Filter on .cb* extensions
 								.pipe(
 									through2.obj(function (item, enc, next) {
-										let fileExtension = path.extname(item.path);
-										if ([".cbz", ".cbr", ".cb7"].includes(fileExtension)) {
+										let fileExtension = path.extname(
+											item.path
+										);
+										if (
+											[".cbz", ".cbr", ".cb7"].includes(
+												fileExtension
+											)
+										) {
 											this.push(item);
 										}
 										next();
@@ -167,7 +182,10 @@ export default class ImportService extends Service {
 								// 1.2 Pipe filtered results to the next step
 								// 	   Enqueue the job in the queue
 								.on("data", async (item) => {
-									console.info("Found a file at path: %s", item.path);
+									console.info(
+										"Found a file at path: %s",
+										item.path
+									);
 									let comicExists = await Comic.exists({
 										"rawFileDetails.name": `${path.basename(
 											item.path,
@@ -176,8 +194,14 @@ export default class ImportService extends Service {
 									});
 									if (!comicExists) {
 										// 2.1 Reset the job counters in Redis
-										await pubClient.set("completedJobCount", 0);
-										await pubClient.set("failedJobCount", 0);
+										await pubClient.set(
+											"completedJobCount",
+											0
+										);
+										await pubClient.set(
+											"failedJobCount",
+											0
+										);
 										// 2.2 Send the extraction job to the queue
 										this.broker.call("jobqueue.enqueue", {
 											fileObject: {
@@ -188,7 +212,9 @@ export default class ImportService extends Service {
 											importType: "new",
 										});
 									} else {
-										console.log("Comic already exists in the library.");
+										console.log(
+											"Comic already exists in the library."
+										);
 									}
 								})
 								.on("end", () => {
@@ -240,19 +266,28 @@ export default class ImportService extends Service {
 							// we solicit volume information and add that to mongo
 							if (
 								comicMetadata.sourcedMetadata.comicvine &&
-								!isNil(comicMetadata.sourcedMetadata.comicvine.volume)
+								!isNil(
+									comicMetadata.sourcedMetadata.comicvine
+										.volume
+								)
 							) {
-								volumeDetails = await this.broker.call("comicvine.getVolumes", {
-									volumeURI:
-										comicMetadata.sourcedMetadata.comicvine.volume
-											.api_detail_url,
-								});
+								volumeDetails = await this.broker.call(
+									"comicvine.getVolumes",
+									{
+										volumeURI:
+											comicMetadata.sourcedMetadata
+												.comicvine.volume
+												.api_detail_url,
+									}
+								);
 								comicMetadata.sourcedMetadata.comicvine.volumeInformation =
 									volumeDetails.results;
 							}
 
 							console.log("Saving to Mongo...");
-							console.log(`Import type: [${ctx.params.importType}]`);
+							console.log(
+								`Import type: [${ctx.params.importType}]`
+							);
 							switch (ctx.params.importType) {
 								case "new":
 									return await Comic.create(comicMetadata);
@@ -273,7 +308,10 @@ export default class ImportService extends Service {
 							}
 						} catch (error) {
 							console.log(error);
-							throw new Errors.MoleculerError("Import failed.", 500);
+							throw new Errors.MoleculerError(
+								"Import failed.",
+								500
+							);
 						}
 					},
 				},
@@ -291,7 +329,9 @@ export default class ImportService extends Service {
 					) {
 						// 1. Find mongo object by id
 						// 2. Import payload into sourcedMetadata.comicvine
-						const comicObjectId = new ObjectId(ctx.params.comicObjectId);
+						const comicObjectId = new ObjectId(
+							ctx.params.comicObjectId
+						);
 
 						return new Promise(async (resolve, reject) => {
 							let volumeDetails = {};
@@ -300,15 +340,18 @@ export default class ImportService extends Service {
 								const volumeDetails = await this.broker.call(
 									"comicvine.getVolumes",
 									{
-										volumeURI: matchedResult.volume.api_detail_url,
+										volumeURI:
+											matchedResult.volume.api_detail_url,
 									}
 								);
-								matchedResult.volumeInformation = volumeDetails.results;
+								matchedResult.volumeInformation =
+									volumeDetails.results;
 								Comic.findByIdAndUpdate(
 									comicObjectId,
 									{
 										$set: {
-											"sourcedMetadata.comicvine": matchedResult,
+											"sourcedMetadata.comicvine":
+												matchedResult,
 										},
 									},
 									{ new: true },
@@ -339,7 +382,9 @@ export default class ImportService extends Service {
 						}>
 					) {
 						console.log(JSON.stringify(ctx.params, null, 2));
-						const comicObjectId = new ObjectId(ctx.params.comicObjectId);
+						const comicObjectId = new ObjectId(
+							ctx.params.comicObjectId
+						);
 
 						return new Promise((resolve, reject) => {
 							Comic.findByIdAndUpdate(
@@ -385,6 +430,7 @@ export default class ImportService extends Service {
 					rest: "POST /getComicBookById",
 					params: { id: "string" },
 					async handler(ctx: Context<{ id: string }>) {
+						console.log(ctx.params.id);
 						return await Comic.findById(ctx.params.id);
 					},
 				},
@@ -393,7 +439,9 @@ export default class ImportService extends Service {
 					params: { ids: "array" },
 					handler: async (ctx: Context<{ ids: [string] }>) => {
 						console.log(ctx.params.ids);
-						const queryIds = ctx.params.ids.map((id) => new ObjectId(id));
+						const queryIds = ctx.params.ids.map(
+							(id) => new ObjectId(id)
+						);
 						return await Comic.find({
 							_id: {
 								$in: queryIds,
@@ -409,7 +457,8 @@ export default class ImportService extends Service {
 						const volumes = await Comic.aggregate([
 							{
 								$project: {
-									volumeInfo: "$sourcedMetadata.comicvine.volumeInformation",
+									volumeInfo:
+										"$sourcedMetadata.comicvine.volumeInformation",
 								},
 							},
 							{
@@ -455,46 +504,52 @@ export default class ImportService extends Service {
 						const { queryObjects } = ctx.params;
 						// construct the query for ElasticSearch
 						let elasticSearchQuery = {};
-						const elasticSearchQueries = queryObjects.map((queryObject) => {
-							console.log("Volume: ", queryObject.volumeName);
-							console.log("Issue: ", queryObject.issueName);
-							if (queryObject.issueName === null) {
-								queryObject.issueName = "";
-							}
-							if (queryObject.volumeName === null) {
-								queryObject.volumeName = "";
-							}
-							elasticSearchQuery = {
-								bool: {
-									must: [
-										{
-											match_phrase: {
-												"rawFileDetails.name": queryObject.volumeName,
+						const elasticSearchQueries = queryObjects.map(
+							(queryObject) => {
+								console.log("Volume: ", queryObject.volumeName);
+								console.log("Issue: ", queryObject.issueName);
+								if (queryObject.issueName === null) {
+									queryObject.issueName = "";
+								}
+								if (queryObject.volumeName === null) {
+									queryObject.volumeName = "";
+								}
+								elasticSearchQuery = {
+									bool: {
+										must: [
+											{
+												match_phrase: {
+													"rawFileDetails.name":
+														queryObject.volumeName,
+												},
 											},
-										},
-										{
-											term: {
-												"inferredMetadata.issue.number": parseInt(
-													queryObject.issueNumber,
-													10
-												),
+											{
+												term: {
+													"inferredMetadata.issue.number":
+														parseInt(
+															queryObject.issueNumber,
+															10
+														),
+												},
 											},
-										},
-									],
-								},
-							};
+										],
+									},
+								};
 
-							return [
-								{
-									index: "comics",
-									search_type: "dfs_query_then_fetch",
-								},
-								{
-									query: elasticSearchQuery,
-								},
-							];
-						});
-						console.log(JSON.stringify(elasticSearchQueries, null, 2));
+								return [
+									{
+										index: "comics",
+										search_type: "dfs_query_then_fetch",
+									},
+									{
+										query: elasticSearchQuery,
+									},
+								];
+							}
+						);
+						console.log(
+							JSON.stringify(elasticSearchQueries, null, 2)
+						);
 
 						return await ctx.broker.call("search.searchComic", {
 							elasticSearchQueries,
@@ -507,11 +562,10 @@ export default class ImportService extends Service {
 					rest: "GET /libraryStatistics",
 					params: {},
 					handler: async (ctx: Context<{}>) => {
-						const comicDirectorySize = await getSizeOfDirectory(COMICS_DIRECTORY, [
-							".cbz",
-							".cbr",
-							".cb7",
-						]);
+						const comicDirectorySize = await getSizeOfDirectory(
+							COMICS_DIRECTORY,
+							[".cbz", ".cbr", ".cb7"]
+						);
 						const totalCount = await Comic.countDocuments({});
 						const statistics = await Comic.aggregate([
 							{
@@ -520,7 +574,11 @@ export default class ImportService extends Service {
 										{
 											$match: {
 												"rawFileDetails.extension": {
-													$in: [".cbr", ".cbz", ".cb7"],
+													$in: [
+														".cbr",
+														".cbz",
+														".cb7",
+													],
 												},
 											},
 										},
@@ -534,9 +592,10 @@ export default class ImportService extends Service {
 									issues: [
 										{
 											$match: {
-												"sourcedMetadata.comicvine.volumeInformation": {
-													$gt: {},
-												},
+												"sourcedMetadata.comicvine.volumeInformation":
+													{
+														$gt: {},
+													},
 											},
 										},
 										{
@@ -599,16 +658,23 @@ export default class ImportService extends Service {
 							.drop()
 							.then(async (data) => {
 								console.info(data);
-								const coversFolderDeleteResult = fsExtra.emptyDirSync(
-									path.resolve(`${USERDATA_DIRECTORY}/covers`)
-								);
-								const expandedFolderDeleteResult = fsExtra.emptyDirSync(
-									path.resolve(`${USERDATA_DIRECTORY}/expanded`)
-								);
-								const eSIndicesDeleteResult = await ctx.broker.call(
-									"search.deleteElasticSearchIndices",
-									{}
-								);
+								const coversFolderDeleteResult =
+									fsExtra.emptyDirSync(
+										path.resolve(
+											`${USERDATA_DIRECTORY}/covers`
+										)
+									);
+								const expandedFolderDeleteResult =
+									fsExtra.emptyDirSync(
+										path.resolve(
+											`${USERDATA_DIRECTORY}/expanded`
+										)
+									);
+								const eSIndicesDeleteResult =
+									await ctx.broker.call(
+										"search.deleteElasticSearchIndices",
+										{}
+									);
 								return {
 									data,
 									coversFolderDeleteResult,

services/search.service.ts

@@ -75,9 +75,9 @@ export default class SettingsService extends Service {
 					) => {
 						try {
 							console.log(ctx.params);
-							const { query, pagination } = ctx.params;
+							const { query, pagination, type } = ctx.params;
 							let eSQuery = {};
-							switch (ctx.params.type) {
+							switch (type) {
 								case "all":
 									Object.assign(eSQuery, {
 										match_all: {},