Skip to content

Commit

Permalink
Merge pull request #498 from andrechristikan/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@andrechristikan
andrechristikan committed Nov 30, 2023
2 parents 19759d4 + 948fc6b commit befc2ca
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 75 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
docker stop ${{ env.APP_NAME }} && docker rm ${{ env.APP_NAME }}
docker network create ${{ env.APP_NETWORK }} --driver=bridge
docker run -itd \
--env 'NODE_ENV=production' \
--env NODE_ENV=production \
--hostname ${{ env.APP_NAME }} \
--publish ${{ secrets.APP_PORT }}:${{ env.APP_PORT }} \
--network ${{ env.APP_NETWORK }} \
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
docker stop ${{ env.APP_NAME }} && docker rm ${{ env.APP_NAME }}
docker network create ${{ env.APP_NETWORK }} --driver=bridge
docker run -itd \
--env 'NODE_ENV=staging' \
--env NODE_ENV=staging \
--hostname ${{ env.APP_NAME }} \
--publish ${{ env.APP_PORT_EXPOSE }}:${{ env.APP_PORT }} \
--network ${{ env.APP_NETWORK }} \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
runs-on: ubuntu-latest

env:
DOCKER_HUB: ${{ secrets.DOCKER_HUB }}
DOCKERFILE: ./ci/dockerfile
DOCKER_HUB: ${{ secrets.DOCKER_HUB }}
DOCKERFILE: ci/dockerfile

steps:
- name: Git checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: yarn --frozen-lockfile

- name: Unit Test
run: yarn test
run: NODE_ENV=test yarn test
env:
CI: true

2 changes: 1 addition & 1 deletion .husky/pre-commit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
yarn lint
yarn deadcode
yarn spell
yarn test
NODE_ENV=test yarn test
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"rollback": "yarn rollback:email && yarn rollback:apikey && yarn rollback:user && yarn rollback:role"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.461.0",
"@aws-sdk/client-ses": "^3.461.0",
"@aws-sdk/client-s3": "^3.462.0",
"@aws-sdk/client-ses": "^3.462.0",
"@casl/ability": "^6.5.0",
"@faker-js/faker": "^8.3.1",
"@joi/date": "^2.1.0",
Expand All @@ -65,15 +65,15 @@
"@nestjs/terminus": "^10.2.0",
"@nestjs/throttler": "^5.0.1",
"@ntegral/nestjs-sentry": "^4.0.0",
"@sentry/node": "^7.83.0",
"@sentry/node": "^7.84.0",
"@types/response-time": "^2.3.8",
"axios": "^1.6.2",
"bcryptjs": "^2.4.3",
"case": "^1.6.3",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"crypto-js": "^4.2.0",
"google-auth-library": "^9.3.0",
"google-auth-library": "^9.4.0",
"helmet": "^7.1.0",
"joi": "^17.11.0",
"moment": "^2.29.4",
Expand Down Expand Up @@ -110,7 +110,7 @@
"@types/lodash": "^4.14.202",
"@types/ms": "^0.7.34",
"@types/multer": "^1.4.11",
"@types/node": "^20.10.0",
"@types/node": "^20.10.1",
"@types/passport-jwt": "^3.0.13",
"@types/supertest": "^2.0.16",
"@types/ua-parser-js": "^0.7.39",
Expand Down
7 changes: 0 additions & 7 deletions src/common/helper/services/helper.file.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,9 @@ import {
IHelperFileCreateExcelWorkbookOptions,
} from 'src/common/helper/interfaces/helper.interface';
import { utils, write, read, WorkBook } from 'xlsx';
import { ConfigService } from '@nestjs/config';

@Injectable()
export class HelperFileService implements IHelperFileService {
private readonly chromeBin: string;

constructor(private readonly configService: ConfigService) {
this.chromeBin = this.configService.get<string>('file.pdf.chromeBin');
}

createExcelWorkbook(
rows: IHelperFileRows[],
options?: IHelperFileCreateExcelWorkbookOptions
Expand Down
114 changes: 57 additions & 57 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@
"@aws-sdk/util-utf8-browser" "^3.0.0"
tslib "^1.11.1"

"@aws-sdk/client-s3@^3.461.0":
version "3.461.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.461.0.tgz#fc50ccb6a56b28646a3725dbc52981633e870c2d"
integrity sha512-pvEWMb2djn3bjD9lelYQhyG8KKKrUMm5MlSaSPwqVTL97iKm/Zbk+Ord6n8qMyPl5JHGmNdfg0tZFxC1qXeHTw==
"@aws-sdk/client-s3@^3.462.0":
version "3.462.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.462.0.tgz#f58855040c38af6ad127066a0413b044d86eff90"
integrity sha512-nyBmsS45b5/YI926dtJp6OA8Fx7yItcdK8lqJq5bgfbskyEqycFCXzykog1AkIBETOeUn3Saztw7HCGZKRad0g==
dependencies:
"@aws-crypto/sha1-browser" "3.0.0"
"@aws-crypto/sha256-browser" "3.0.0"
"@aws-crypto/sha256-js" "3.0.0"
"@aws-sdk/client-sts" "3.461.0"
"@aws-sdk/client-sts" "3.462.0"
"@aws-sdk/core" "3.451.0"
"@aws-sdk/credential-provider-node" "3.460.0"
"@aws-sdk/middleware-bucket-endpoint" "3.460.0"
Expand Down Expand Up @@ -212,14 +212,14 @@
fast-xml-parser "4.2.5"
tslib "^2.5.0"

"@aws-sdk/client-ses@^3.461.0":
version "3.461.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-ses/-/client-ses-3.461.0.tgz#195d165fc29e90601e5d0f91d8e34b59fd34cfb2"
integrity sha512-hDYnZ1fjk5tyVxXTe62urSxq4S3PG3dIIO6AUlWHA9BrGd7C2zAZFx728q2vRo74OJQhT2ycn0w4MGneUtQxgA==
"@aws-sdk/client-ses@^3.462.0":
version "3.462.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-ses/-/client-ses-3.462.0.tgz#7c20cdd5f7d921429d628f25af4404188df82bf9"
integrity sha512-6hK0DpXtvmgqwQpolPG9HOC5aDvgESoBLvd2z/5tOfrmkKcav7NQOniKY11i/6gfNCFbjYpSnR4xW9Q7w0gchQ==
dependencies:
"@aws-crypto/sha256-browser" "3.0.0"
"@aws-crypto/sha256-js" "3.0.0"
"@aws-sdk/client-sts" "3.461.0"
"@aws-sdk/client-sts" "3.462.0"
"@aws-sdk/core" "3.451.0"
"@aws-sdk/credential-provider-node" "3.460.0"
"@aws-sdk/middleware-host-header" "3.460.0"
Expand Down Expand Up @@ -301,10 +301,10 @@
"@smithy/util-utf8" "^2.0.2"
tslib "^2.5.0"

"@aws-sdk/client-sts@3.461.0":
version "3.461.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.461.0.tgz#f62f75bb7483f73169896bd283ab126b7e97f287"
integrity sha512-1u+t31m23vuc9zkiUk51L4QbwuRQEuBeMArHK/thmq4V+A0VmjoAr/x2D0eQ0deOuBqG5YC62oaqUfIhj03SIw==
"@aws-sdk/client-sts@3.462.0":
version "3.462.0"
resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.462.0.tgz#7168e8c29e2c3b67aca64841a72acd041c409a65"
integrity sha512-oO6SVGB9kR0dwc4T/M3++TcioBVv26cEpxZGS4BcKMDxSjkCLqJ/jE37aCNNPGTlCAhnuOAwqGjFqYrsehsI1Q==
dependencies:
"@aws-crypto/sha256-browser" "3.0.0"
"@aws-crypto/sha256-js" "3.0.0"
Expand Down Expand Up @@ -2040,45 +2040,45 @@
resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==

"@sentry-internal/tracing@7.83.0":
version "7.83.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.83.0.tgz#8f69d339569b020c495f8350a8ea527c369586e8"
integrity sha512-fY1ZyOiQaaUTuoq5rO+G4/5Ov3n8BnfNK7ck97yAGxy3w+E1CwhVZkXHEvTngNfdYV3ArxvlrtPRb9STFRqXvQ==
"@sentry-internal/tracing@7.84.0":
version "7.84.0"
resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.84.0.tgz#430da253ee5b075be4ef57f20ea842c0208bc6b0"
integrity sha512-y9bGYA0OM6PEREfd+nk4UURZy29tpIw+7vQwpxWfEVs2fqq0/5TBFX/tKFb8AKUI9lVM8v0bcF0bNSCnuPQZHQ==
dependencies:
"@sentry/core" "7.83.0"
"@sentry/types" "7.83.0"
"@sentry/utils" "7.83.0"
"@sentry/core" "7.84.0"
"@sentry/types" "7.84.0"
"@sentry/utils" "7.84.0"

"@sentry/core@7.83.0":
version "7.83.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.83.0.tgz#29bdd5aba40a6f25c01c68387b6a9aa13e27f20a"
integrity sha512-fglvpw8aWM6nWXzCjAVXIMTiTEAQ9G9b85IpDd/7L8fuwaFTPQAUSJXupF2PfbpQ3FUYbJt80dxshbERVJG8vQ==
"@sentry/core@7.84.0":
version "7.84.0"
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.84.0.tgz#01d33fc452044ffd8ea57b20f60304b9cfa2b9e1"
integrity sha512-tbuwunbBx2kSex15IHCqHDnrMfIlqPc6w/76fwkGqokz3oh9GSEGlLICwmBWL8AypWimUg13IDtFpD0TJTriWA==
dependencies:
"@sentry/types" "7.83.0"
"@sentry/utils" "7.83.0"
"@sentry/types" "7.84.0"
"@sentry/utils" "7.84.0"

"@sentry/node@^7.83.0":
version "7.83.0"
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.83.0.tgz#199965f4c0cb3cd0d2ae590faa260d2505c38528"
integrity sha512-ibnON+5ovoGOsvcLxcWQu5XAc4rbkvDkzCP74YGnME3/NzRuo3cKam8bUL5Wlm15h68QzxskyNOLuj6BEJ6AfQ==
"@sentry/node@^7.84.0":
version "7.84.0"
resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.84.0.tgz#c06167106796b2b83c0a9b52fa56f8ca820034ca"
integrity sha512-Xm3fIXT3TZOQi+6uQBavI8iOehD3PkY7v0y3hog0d4lQTH88vQK9BBsI+jZEq81Em+RG/u7vZNiFo6YMTnWF7Q==
dependencies:
"@sentry-internal/tracing" "7.83.0"
"@sentry/core" "7.83.0"
"@sentry/types" "7.83.0"
"@sentry/utils" "7.83.0"
"@sentry-internal/tracing" "7.84.0"
"@sentry/core" "7.84.0"
"@sentry/types" "7.84.0"
"@sentry/utils" "7.84.0"
https-proxy-agent "^5.0.0"

"@sentry/types@7.83.0":
version "7.83.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.83.0.tgz#117e45900603190c547e52bba35e1b3d539d47fb"
integrity sha512-Bd+zJcy8p1VgCfQqUprmUaw0QPWUV+GmCt6zJRHrHTb2pwLahXv6sHJvQ8F8Va6S7Keuy088U+kHzUFGQLMZMQ==
"@sentry/types@7.84.0":
version "7.84.0"
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.84.0.tgz#e8db86c36c61659c3b2558f0aa8b6a073a756117"
integrity sha512-VqGLIF3JOUrk7yIXjLXJvAORkZL1e3dDX0Q1okRehwyt/5CRE+mdUTeJZkBo9P9mBwgMyvtwklzOGGrzjb4eMA==

"@sentry/utils@7.83.0":
version "7.83.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.83.0.tgz#ec0fc0a468ec35ab9623603f1ba218dd58233eda"
integrity sha512-7SrZtgAn3pHFBqSSvV/VL0CWTBQ7VenJjok4+WGWd6/FhP3fKrEEd9rjVTUb2Pzq9WLJJYzdvxAG8RlggG+H4g==
"@sentry/utils@7.84.0":
version "7.84.0"
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.84.0.tgz#32861d922fa31e86dd2863a1d9dfc5a369e98952"
integrity sha512-qdUVuxnRBvaf05AU+28R+xYtZmi/Ymf8os3Njq9g4XuA+QEkZLbzmIpRK5W9Ja7vUtjOeg29Xgg43A8znde9LQ==
dependencies:
"@sentry/types" "7.83.0"
"@sentry/types" "7.84.0"

"@sideway/address@^4.1.3":
version "4.1.4"
Expand Down Expand Up @@ -2946,10 +2946,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.3.tgz#463fc47f13ec0688a33aec75d078a0541a447199"
integrity sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==

"@types/node@^20.10.0":
version "20.10.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617"
integrity sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==
"@types/node@^20.10.1":
version "20.10.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.1.tgz#d2c96f356c3125fedc983d74c424910c3767141c"
integrity sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==
dependencies:
undici-types "~5.26.4"

Expand Down Expand Up @@ -5385,10 +5385,10 @@ gaxios@^6.0.0:
is-stream "^2.0.0"
node-fetch "^2.6.9"

gcp-metadata@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.0.0.tgz#2ae12008bef8caa8726cba31fd0a641ebad5fb56"
integrity sha512-Ozxyi23/1Ar51wjUT2RDklK+3HxqDr8TLBNK8rBBFQ7T85iIGnXnVusauj06QyqCXRFZig8LZC+TUddWbndlpQ==
gcp-metadata@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.1.0.tgz#9b0dd2b2445258e7597f2024332d20611cbd6b8c"
integrity sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==
dependencies:
gaxios "^6.0.0"
json-bigint "^1.0.0"
Expand Down Expand Up @@ -5566,15 +5566,15 @@ globby@^11.1.0:
merge2 "^1.4.1"
slash "^3.0.0"

google-auth-library@^9.3.0:
version "9.3.0"
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.3.0.tgz#2e083d302feeacb2bb38d24f826f62863567ec4f"
integrity sha512-W0F5CB7rAi9l+7/IVeKu26+KdzY6tCwXKAlLsZrleU/Q61XM16uonrDCQNld3Douv/5CH+YoULqNEVVkdmi5Qw==
google-auth-library@^9.4.0:
version "9.4.0"
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.4.0.tgz#5849ae284105d41ee885374c80b67fbb6c24ee1c"
integrity sha512-Sn7w6p59lP3sHWPjLBc5OY6Y44CwbRrst5vAVpVhtSeMzTzZAGheyovaHDkcRRl6QeGl+H3a1GNiHLcLsCJTCw==
dependencies:
base64-js "^1.3.0"
ecdsa-sig-formatter "^1.0.11"
gaxios "^6.0.0"
gcp-metadata "^6.0.0"
gcp-metadata "^6.1.0"
gtoken "^7.0.0"
jws "^4.0.0"

Expand Down

0 comments on commit befc2ca

Please sign in to comment.