Skip to content

Commit

Permalink
Merge tag '1.5.9' into develop
Browse files Browse the repository at this point in the history
Adjustments:

- Updated dependencies
- Updated Dockerfile
- Changing mocha configuration file (mocha.opts for .mocharc.yml)
  • Loading branch information
jeffsampaio committed Apr 3, 2020
2 parents d83a13a + 66174e6 commit 7c038ba
Show file tree
Hide file tree
Showing 8 changed files with 822 additions and 449 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.16.3
FROM node:12.13.1

# Create app directory
RUN mkdir -p /usr/src/ds
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Data Sync Agent Service
[![License][license-image]][license-url] [![Node][node-image]][node-url] [![Travis][travis-image]][travis-url] [![Coverage][coverage-image]][coverage-url] [![Dependencies][dependencies-image]][dependencies-url] [![DependenciesDev][dependencies-dev-image]][dependencies-dev-url] [![Vulnerabilities][known-vulnerabilities-image]][known-vulnerabilities-url] [![Commit][last-commit-image]][last-commit-url] [![Releases][releases-image]][releases-url] [![Contributors][contributors-image]][contributors-url] [![Swagger][swagger-image]][swagger-url]

Microservice responsible for data synchronization of FitBit and CVE platform with OCARIoT platform.
Microservice responsible for data synchronization of FitBit platform with OCARIoT platform.

**Main features:**
- Fitbit access token management;
Expand Down
1,192 changes: 781 additions & 411 deletions package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "data-sync-agent",
"version": "1.5.8",
"description": "Service responsible for data synchronization of FitBit and CVE platform with OCARIoT platform.",
"version": "1.5.9",
"description": "Service responsible for data synchronization of FitBit platform with OCARIoT platform.",
"main": "dist/server.js",
"scripts": {
"build": "gulp build",
"build:doc": "typedoc --options typedoc.json",
"start": "node dist/server.js",
"start:dev": "gulp dev",
"tslint": "tslint -c tslint.json -p tsconfig.json",
"test": "nyc --clean --reporter=text-summary mocha --opts test/mocha.opts test/**/*.spec.ts",
"test:unit": "nyc --clean --all --reporter=text-summary mocha --opts test/mocha.opts test/unit/**/*.spec.ts",
"test:integration": "nyc --clean --all --reporter=text-summary mocha --opts test/mocha.opts test/integration/**/*.spec.ts",
"test:single": "mocha --opts test/mocha.opts",
"test:cov": "nyc --clean --all --reporter=html --reporter=text mocha --opts test/mocha.opts test/**/*.spec.ts"
"test": "nyc --clean --reporter=text-summary mocha --config test/.mocharc.yml test/**/*.spec.ts",
"test:unit": "nyc --clean --all --reporter=text-summary mocha --config test/.mocharc.yml test/unit/**/*.spec.ts",
"test:integration": "nyc --clean --all --reporter=text-summary mocha --config test/.mocharc.yml test/integration/**/*.spec.ts",
"test:single": "mocha --config test/.mocharc.yml",
"test:cov": "nyc --clean --all --reporter=html --reporter=text mocha --config test/.mocharc.yml test/**/*.spec.ts"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -53,50 +53,50 @@
"all": true
},
"dependencies": {
"@ocariot/rabbitmq-client-node": "1.4.0",
"@ocariot/rabbitmq-client-node": "1.5.1",
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"bull": "^3.12.1",
"bull": "^3.13.0",
"dotenv": "^8.2.0",
"express": "^4.17.1",
"fitbit-node": "^2.2.0",
"helmet": "^3.21.2",
"helmet": "^3.22.0",
"inversify": "^5.0.1",
"inversify-express-utils": "^6.3.2",
"jsonwebtoken": "^8.5.1",
"moment": "^2.24.0",
"mongoose": "5.8.2",
"morgan": "^1.9.1",
"morgan": "^1.10.0",
"node-cron": "^2.0.3",
"query-strings-parser": "^2.1.3",
"reflect-metadata": "^0.1.13",
"swagger-ui-express": "^4.1.3",
"swagger-ui-express": "^4.1.4",
"winston": "^3.2.1",
"winston-daily-rotate-file": "^4.4.2"
},
"devDependencies": {
"@types/body-parser": "^1.17.1",
"@types/bull": "^3.10.6",
"@types/chai": "^4.2.7",
"@types/express": "^4.17.2",
"@types/body-parser": "^1.19.0",
"@types/bull": "^3.12.1",
"@types/chai": "^4.2.11",
"@types/express": "^4.17.4",
"@types/helmet": "^0.0.45",
"@types/mocha": "^5.2.7",
"@types/mongoose": "^5.5.43",
"@types/morgan": "^1.7.37",
"@types/swagger-ui-express": "^4.1.1",
"@types/mocha": "^7.0.2",
"@types/mongoose": "^5.7.8",
"@types/morgan": "^1.9.0",
"@types/swagger-ui-express": "^4.1.2",
"chai": "^4.2.0",
"gulp": "^4.0.2",
"gulp-nodemon": "^2.4.2",
"gulp-nodemon": "^2.5.0",
"gulp-tslint": "^8.1.4",
"gulp-typescript": "^5.0.1",
"mocha": "^6.2.2",
"mocha": "^7.1.1",
"nyc": "^15.0.0",
"sinon": "^7.5.0",
"sinon-mongoose": "^2.3.0",
"supertest": "^4.0.2",
"ts-node": "^8.6.2",
"tslint": "^6.0.0",
"typedoc": "^0.16.9",
"typescript": "^3.7.5"
"ts-node": "^8.8.1",
"tslint": "^6.1.1",
"typedoc": "^0.17.3",
"typescript": "^3.8.3"
}
}
2 changes: 1 addition & 1 deletion src/utils/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export abstract class Default {
public static readonly APP_ID: string = 'ds.app'
public static readonly APP_TITLE: string = 'OCARIoT Data Sync Agent Service'
public static readonly APP_DESCRIPTION: string = 'Microservice responsible for data synchronization of FitBit ' +
'and CVE platform with OCARIoT platform.'
'platform with OCARIoT platform.'
public static readonly NODE_ENV: string = 'development' // development, test, production
public static readonly PORT_HTTP: number = 5000
public static readonly PORT_HTTPS: number = 5001
Expand Down
2 changes: 1 addition & 1 deletion src/utils/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
export abstract class Strings {
public static readonly APP: any = {
TITLE: 'Data Sync Agent Service',
APP_DESCRIPTION: 'Microservice responsible for data synchronization of FitBit and CVE platform with OCARIoT platform.'
APP_DESCRIPTION: 'Microservice responsible for data synchronization of FitBit platform with OCARIoT platform.'
}

public static readonly PARAMETERS: any = {
Expand Down
11 changes: 11 additions & 0 deletions test/.mocharc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
extension:
- ts
exit: true # could be expressed as "no-exit: true"
recursive: true
reporter: spec
require:
- 'test/helpers.ts'
- 'ts-node/register'
- 'reflect-metadata/Reflect'
slow: 5000
timeout: 10000 # same as "no-timeout: true" or "timeout: 0"
8 changes: 0 additions & 8 deletions test/mocha.opts

This file was deleted.

0 comments on commit 7c038ba

Please sign in to comment.