frishi/threetwo-metadata-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 Removed axios-cache-adapter

Browse Source
This commit is contained in:
Rishi Ghan
2022-02-13 22:25:26 -08:00
parent 07eaaac117
commit d2e5a7664d
2 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
package-lock.json generated
View File

@@ -4321,9 +4321,9 @@
"dev": true "dev": true
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.14.7", "version": "1.14.8",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@@ -10076,9 +10076,9 @@
] ]
}, },
"node_modules/simple-get": { "node_modules/simple-get": {
"version": "3.1.0", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
"dependencies": { "dependencies": {
"decompress-response": "^4.2.0", "decompress-response": "^4.2.0",
"once": "^1.3.1", "once": "^1.3.1",
@@ -15252,9 +15252,9 @@
"dev": true "dev": true
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.14.7", "version": "1.14.8",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
}, },
"for-in": { "for-in": {
"version": "1.0.2", "version": "1.0.2",
@@ -19552,9 +19552,9 @@
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
}, },
"simple-get": { "simple-get": {
"version": "3.1.0", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
"requires": { "requires": {
"decompress-response": "^4.2.0", "decompress-response": "^4.2.0",
"once": "^1.3.1", "once": "^1.3.1",

84
services/comicvine.service.ts
View File

@@ -4,6 +4,7 @@ import { Service, ServiceBroker, Context } from "moleculer";
import axios from "axios"; import axios from "axios";
import delay from "delay"; import delay from "delay";
import { isNil, isUndefined } from "lodash"; import { isNil, isUndefined } from "lodash";
import { matchScorer, rankVolumes } from "../utils/searchmatchscorer.utils"; import { matchScorer, rankVolumes } from "../utils/searchmatchscorer.utils";
const CV_BASE_URL = "https://comicvine.gamespot.com/api/"; const CV_BASE_URL = "https://comicvine.gamespot.com/api/";
@@ -77,30 +78,60 @@ export default class ComicVineService extends Service {
); );
// 2. Query CV and get metadata for them // 2. Query CV and get metadata for them
const issuesPromises = await comicBookDetails.sourcedMetadata.comicvine.volumeInformation.issues.map( const issuesPromises =
async (issue: any, idx: any) => { await comicBookDetails.sourcedMetadata.comicvine.volumeInformation.issues.map(
await delay(1000); async (issue: any, idx: any) => {
const metadata: any = await axios.request({ await delay(1000);
url: `${issue.api_detail_url}?api_key=${process.env.COMICVINE_API_KEY}`, const metadata: any = await axios.request({
params: { url: `${issue.api_detail_url}?api_key=${process.env.COMICVINE_API_KEY}`,
resources: "issues", params: {
limit: "100", resources: "issues",
format: "json", limit: "100",
}, format: "json",
headers: { },
"User-Agent": "ThreeTwo", headers: {
}, "User-Agent": "ThreeTwo",
}); },
const issueMetadata = metadata.data.results; });
const issueMetadata = metadata.data.results;
// 3. Just return the issues // 3. Just return the issues
return issueMetadata; return issueMetadata;
} }
); );
return Promise.all(issuesPromises); return Promise.all(issuesPromises);
}, },
}, },
getWeeklyPullList: {
rest: "GET /getWeeklyPullList",
params: {},
timeout: 10000000,
handler: async (
ctx: Context<{
startDate: string;
endDate: string;
}>
) => {
const dateFilter = `store_date: ${ctx.params.startDate} | ${ctx.params.endDate}`;
console.log(dateFilter);
// Get issues for that date
const result = await axios({
url: `https://comicvine.gamespot.com/api/issues?api_key=${process.env.COMICVINE_API_KEY}`,
method: "get",
params: {
resources: "issues",
limit: "5",
format: "json",
filter: dateFilter,
},
headers: { "User-Agent": "ThreeTwo" },
});
return result.data;
},
},
volumeBasedSearch: { volumeBasedSearch: {
rest: "POST /volumeBasedSearch", rest: "POST /volumeBasedSearch",
params: {}, params: {},
@@ -122,13 +153,11 @@ export default class ComicVineService extends Service {
resources: string; resources: string;
scorerConfiguration?: { scorerConfiguration?: {
searchParams: { searchParams: {
name: string; name: string;
subtitle?: string; subtitle?: string;
number: string; number: string;
year: string; year: string;
}; };
}; };
rawFileDetails: object; rawFileDetails: object;
}> }>
@@ -169,7 +198,8 @@ export default class ComicVineService extends Service {
) )
) { ) {
const issueYear = parseInt( const issueYear = parseInt(
ctx.params.scorerConfiguration.searchParams.year, ctx.params.scorerConfiguration.searchParams
.year,
10 10
); );
coverDateFilter = `cover_date:${ coverDateFilter = `cover_date:${