From aa8ae8c5af01f1df65664a01cded15bf6bc75e57 Mon Sep 17 00:00:00 2001 From: harshithnrao Date: Tue, 25 Feb 2025 15:45:31 +0530 Subject: [PATCH] testing microservice to microservice cal checking if textbookExisits before creating the test --- .vscode/launch.json | 15 +++++ package-lock.json | 95 ++++++++++++++++++++++++---- package.json | 1 + src/app-config/app-config.service.ts | 4 ++ src/app-config/config.json | 3 + src/app-config/config.local.json | 3 + src/app.service.ts | 4 ++ src/common/Utility.ts | 1 + src/common/common.service.ts | 1 + src/test/test.module.ts | 3 +- src/test/test.service.ts | 24 +++++-- 11 files changed, 136 insertions(+), 18 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..2ba986f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "chrome", + "request": "launch", + "name": "Launch Chrome against localhost", + "url": "http://localhost:8080", + "webRoot": "${workspaceFolder}" + } + ] +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b2c877f..2541ecc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "UNLICENSED", "dependencies": { "@nestjs-modules/mailer": "^1.10.3", + "@nestjs/axios": "^4.0.0", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.1.1", "@nestjs/core": "^10.0.0", @@ -1641,6 +1642,17 @@ "pug": ">=3.0.1" } }, + "node_modules/@nestjs/axios": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-4.0.0.tgz", + "integrity": "sha512-1cB+Jyltu/uUPNQrpUimRHEQHrnQrpLzVj6dU3dgn6iDDDdahr10TgHFGTmw5VuJ9GzKZsCLDL78VSwJAs/9JQ==", + "license": "MIT", + "peerDependencies": { + "@nestjs/common": "^10.0.0 || ^11.0.0", + "axios": "^1.3.1", + "rxjs": "^7.0.0" + } + }, "node_modules/@nestjs/cli": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-10.2.1.tgz", @@ -2945,8 +2957,19 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "license": "MIT", + "peer": true, + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } }, "node_modules/babel-jest": { "version": "29.7.0", @@ -3725,7 +3748,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "dependencies": { "delayed-stream": "~1.0.0" }, @@ -4063,7 +4085,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "engines": { "node": ">=0.4.0" } @@ -5166,6 +5187,27 @@ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", @@ -5235,7 +5277,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8934,6 +8975,13 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT", + "peer": true + }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", @@ -12871,6 +12919,12 @@ "pug": "^3.0.2" } }, + "@nestjs/axios": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-4.0.0.tgz", + "integrity": "sha512-1cB+Jyltu/uUPNQrpUimRHEQHrnQrpLzVj6dU3dgn6iDDDdahr10TgHFGTmw5VuJ9GzKZsCLDL78VSwJAs/9JQ==", + "requires": {} + }, "@nestjs/cli": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/@nestjs/cli/-/cli-10.2.1.tgz", @@ -13882,8 +13936,18 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "peer": true, + "requires": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } }, "babel-jest": { "version": "29.7.0", @@ -14442,7 +14506,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -14686,8 +14749,7 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" }, "depd": { "version": "2.0.0", @@ -15524,6 +15586,12 @@ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, + "follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "peer": true + }, "foreground-child": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", @@ -15578,7 +15646,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -18419,6 +18486,12 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "peer": true + }, "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", diff --git a/package.json b/package.json index 47aa1a4..6f1db82 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ }, "dependencies": { "@nestjs-modules/mailer": "^1.10.3", + "@nestjs/axios": "^4.0.0", "@nestjs/common": "^10.0.0", "@nestjs/config": "^3.1.1", "@nestjs/core": "^10.0.0", diff --git a/src/app-config/app-config.service.ts b/src/app-config/app-config.service.ts index 13f4d73..b4175b0 100644 --- a/src/app-config/app-config.service.ts +++ b/src/app-config/app-config.service.ts @@ -41,4 +41,8 @@ export class AppConfigService { getMailConfig() { return configMaster[this.defaultEnv].mailConfig; } + + getUrlConfig(){ + return configMaster[this.defaultEnv].urlConfig; + } } diff --git a/src/app-config/config.json b/src/app-config/config.json index 19deef6..cb97966 100644 --- a/src/app-config/config.json +++ b/src/app-config/config.json @@ -29,6 +29,9 @@ "defaults": { "from": "\"No Reply\" " } + }, + "urlConfig": { + "textbookBaseUrl": "http://localhost/content/textbooks/" } } } \ No newline at end of file diff --git a/src/app-config/config.local.json b/src/app-config/config.local.json index 19deef6..cb97966 100644 --- a/src/app-config/config.local.json +++ b/src/app-config/config.local.json @@ -29,6 +29,9 @@ "defaults": { "from": "\"No Reply\" " } + }, + "urlConfig": { + "textbookBaseUrl": "http://localhost/content/textbooks/" } } } \ No newline at end of file diff --git a/src/app.service.ts b/src/app.service.ts index 87d9088..42edebf 100644 --- a/src/app.service.ts +++ b/src/app.service.ts @@ -41,6 +41,10 @@ export class AppService { const emailConfig = this.configService.getMailConfig(); this.commonService.mailConfig = emailConfig; Utility.mailConfig = emailConfig; + + const urlConfig = this.configService.getUrlConfig(); + this.commonService.urlConfig = urlConfig; + Utility.urlConfig = urlConfig; } getModels() { diff --git a/src/common/Utility.ts b/src/common/Utility.ts index 8102af5..5d79645 100644 --- a/src/common/Utility.ts +++ b/src/common/Utility.ts @@ -19,4 +19,5 @@ export class Utility { "from": "\"No Reply\" " } }; + static urlConfig:any; } \ No newline at end of file diff --git a/src/common/common.service.ts b/src/common/common.service.ts index 490b0a3..0b30432 100644 --- a/src/common/common.service.ts +++ b/src/common/common.service.ts @@ -7,6 +7,7 @@ export class CommonService { models: any; fileConfig: any; mailConfig: any; + urlConfig:any; constructor() { } diff --git a/src/test/test.module.ts b/src/test/test.module.ts index 8a77c66..9388a30 100644 --- a/src/test/test.module.ts +++ b/src/test/test.module.ts @@ -1,10 +1,11 @@ import { Module } from '@nestjs/common'; import { TestController } from './test.controller'; import { TestService } from './test.service'; +import { HttpModule } from '@nestjs/axios'; @Module({ + imports: [HttpModule], providers: [TestService], controllers: [TestController], - imports: [] }) export class TestModule { } diff --git a/src/test/test.service.ts b/src/test/test.service.ts index 2140614..7c9c3aa 100644 --- a/src/test/test.service.ts +++ b/src/test/test.service.ts @@ -1,16 +1,24 @@ import { Injectable } from '@nestjs/common'; -import Test from './test.entity'; +import Test from './test.entity'; +import { firstValueFrom } from 'rxjs'; +import { HttpService } from "@nestjs/axios"; +import { Utility } from 'src/common/Utility'; @Injectable() export class TestService { - constructor() { } + constructor(private readonly httpService: HttpService) { } async findAll(): Promise<{ rows: Test[], count: number }> { return Test.findAndCountAll(); } - findByPk(id: number): Promise { - return Test.findByPk(id,) + async findByPk(id: number): Promise { + + const test = Test.findByPk(id,) + const textbookExists = await this.checkTextbookExists((await test).textbookId); + if (!textbookExists.data.author) return; + console.log(textbookExists.data.author); + return test } findOne(test: Test): Promise { @@ -33,9 +41,13 @@ export class TestService { } } if (insertIfNotFound) { + const textbookExists = await this.checkTextbookExists(test.textbookId); + if (!textbookExists) return; return Test.create(test as any) } } - - + async checkTextbookExists(textbookId: number): Promise { + const textbook = await firstValueFrom(this.httpService.get(`${Utility.urlConfig.textbookBaseUrl}${textbookId}`)); + return textbook.data; + } }