renaming consumer_analytics for consumer

Program-AR · Jan 5, 2023 · 0f82af6 · 0f82af6
1 parent 5649a8b
commit 0f82af6
Show file tree

Hide file tree

Showing 23 changed files with 18 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -8,11 +8,11 @@ This project contains the following sub-projects:
 
 - **Pilas Bloques API**: REST-API for Pilas Bloques app.
 - **Pilas Bloques Analytics**: REST-API for logging Pilas Bloques usage for scientific purposes.
-- **Pilas Bloques Analytics Consumer**: Pilas Bloques data users consumer for scientific purposes.
+- **Pilas Bloques Consumer**: Pilas Bloques data users consumer for scientific purposes. Consumes data from Pilas Bloques Analytics' database.
 
 ## Requisites
 - [Nodejs](https://nodejs.org/es/) (v12 >=)
-- [MonngoDB](https://www.mongodb.com/). This can be done by running a docker image:
+- [MongoDB](https://www.mongodb.com/). This can be done by running a docker image:
 
 Docker run example:
 ```
@@ -33,14 +33,14 @@ For development
 
 For production
 - Run `npm run build` for make `dist` directory. (TODO)
-- Run `npm start:[sub-project]` for server starts. The options are `api`, `anaytics` and `consumer_analytics`
+- Run `npm start:[sub-project]` for server starts. The options are `api`, `anaytics` and `consumer`
 
 ## Running tests
 
 All tests
 - Run `npm test`
 
-If you want to test a specific sub-project, run `npm test:[sub-project]`, with the options: `api`, `analytics` and `consumer_analytics`.
+If you want to test a specific sub-project, run `npm test:[sub-project]`, with the options: `api`, `analytics` and `consumer`.
 
 Only one file
 - Run `npm test -- -f <FILE_PATH>`

diff --git a/package.json b/package.json
@@ -9,17 +9,16 @@
     "test:api": "npm run test:api:noTimeout -- --testTimeout 5000",
     "test:api:noTimeout": "DOTENV_CONFIG_PATH=./test/api/.env.test jest /test/api --setupFiles dotenv/config --colors --testPathIgnorePatterns dist --runInBand",
     "test:analytics": "jest /test/analytics --colors --testPathIgnorePatterns dist --testTimeout 5000 --runInBand",
-    "test:consumer_analytics": "npm run seed:consumer_analytics && npm run test:consumer_analytics:unit -- --watch",
-    "test:consumer_analytics:CI": "npm run seed:consumer_analytics && npm run test:consumer_analytics:unit",
-    "test:consumer_analytics:unit": "DOTENV_CONFIG_PATH=./test/consumer_analytics/.env.test jest --setupFiles dotenv/config --colors --testPathIgnorePatterns dist --testTimeout 5000 --runInBand",
-    "seed:consumer_analytics": "seed --drop-database --replace-id --set-timestamps --db-name pilas-bloques-consumer-test ./test/consumer_analytics/persistence",
+    "test:consumer": "npm run seed:consumer && npm run test:consumer:unit -- --watch",
+    "test:consumer:CI": "npm run seed:consumer && npm run test:consumer:unit",
+    "test:consumer:unit": "DOTENV_CONFIG_PATH=./test/consumer/.env.test jest --setupFiles dotenv/config --colors --testPathIgnorePatterns dist --testTimeout 5000 --runInBand",
+    "seed:consumer": "seed --drop-database --replace-id --set-timestamps --db-name pilas-bloques-consumer-test ./test/consumer/persistence",
     "start:analytics": "node dist/analytics/index.js",
     "start:api": "node dist/api/index.js",
-    "start:consumer_analytics": "ts-node src/consumer_analytics/index.ts",
+    "start:consumer": "ts-node src/consumer/index.ts",
     "dev": "bash ./scripts/runBackend.sh",
     "dev:analytics": "nodemon --watch 'src/analytics/**/*.ts' --ignore 'src/analytics/**/*.spec.ts' --exec 'ts-node' src/analytics/index.ts",
     "dev:api": "nodemon --watch 'src/api/**/*.ts' --ignore 'src/api/**/*.spec.ts' --exec 'ts-node' src/api/index.ts",
-    "dev:consumer_analytics": "nodemon --watch 'src/consumer_analytics/**/*.ts' --ignore 'src/consumer_analytics/**/*.spec.ts' --exec 'ts-node' src/consumer_analytics/index.ts",
     "lint": "eslint .",
     "prepackage": "rm -Rf dist && npm run build && cp -R node_modules dist/",
     "package": "npm run package:api && npm run package:analytics",

diff --git a/src/consumer_analytics/commands/analyze.ts → src/consumer/commands/analyze.ts b/src/consumer_analytics/commands/analyze.ts → src/consumer/commands/analyze.ts
diff --git a/src/consumer_analytics/commands/results.ts → src/consumer/commands/results.ts b/src/consumer_analytics/commands/results.ts → src/consumer/commands/results.ts
diff --git a/src/consumer_analytics/commands/runner.ts → src/consumer/commands/runner.ts b/src/consumer_analytics/commands/runner.ts → src/consumer/commands/runner.ts
diff --git a/src/consumer_analytics/commands/utils.ts → src/consumer/commands/utils.ts b/src/consumer_analytics/commands/utils.ts → src/consumer/commands/utils.ts
diff --git a/src/consumer_analytics/index.ts → src/consumer/index.ts b/src/consumer_analytics/index.ts → src/consumer/index.ts
diff --git a/src/consumer_analytics/models/experience.ts → src/consumer/models/experience.ts b/src/consumer_analytics/models/experience.ts → src/consumer/models/experience.ts
diff --git a/src/consumer_analytics/models/session.ts → src/consumer/models/session.ts b/src/consumer_analytics/models/session.ts → src/consumer/models/session.ts
diff --git a/src/consumer_analytics/models/trial.ts → src/consumer/models/trial.ts b/src/consumer_analytics/models/trial.ts → src/consumer/models/trial.ts
diff --git a/src/consumer_analytics/models/utils.ts → src/consumer/models/utils.ts b/src/consumer_analytics/models/utils.ts → src/consumer/models/utils.ts
diff --git a/...onsumer_analytics/persistence/analyzer.ts → src/consumer/persistence/analyzer.ts b/...onsumer_analytics/persistence/analyzer.ts → src/consumer/persistence/analyzer.ts
diff --git a/...consumer_analytics/persistence/connect.ts → src/consumer/persistence/connect.ts b/...consumer_analytics/persistence/connect.ts → src/consumer/persistence/connect.ts
diff --git a/test/consumer_analytics/.env.test → test/consumer/.env.test b/test/consumer_analytics/.env.test → test/consumer/.env.test
diff --git a/test/consumer_analytics/experience.spec.ts → test/consumer/experience.spec.ts b/test/consumer_analytics/experience.spec.ts → test/consumer/experience.spec.ts
diff --git a/...tics/persistence/1_solutions/solutions.ts → ...umer/persistence/1_solutions/solutions.ts b/...tics/persistence/1_solutions/solutions.ts → ...umer/persistence/1_solutions/solutions.ts
diff --git a/...er_analytics/persistence/analyzer.spec.ts → test/consumer/persistence/analyzer.spec.ts b/...er_analytics/persistence/analyzer.spec.ts → test/consumer/persistence/analyzer.spec.ts
@@ -1,8 +1,8 @@
 import describeDB from './describeDB'
 import { solutions } from './1_solutions/solutions'
-import analyzer, { reduce, ExperienceByChallenge, finalize } from '../../../src/consumer_analytics/persistence/analyzer'
+import analyzer, { reduce, ExperienceByChallenge, finalize } from '../../../src/consumer/persistence/analyzer'
 import { CompleteSolution as Solution } from '../../../src/models/solution'
-import { Experience } from '../../../src/consumer_analytics/models/experience'
+import { Experience } from '../../../src/consumer/models/experience'
 import { expectJSON, newExperience, deleteCollection } from '../utils'
 
 describeDB('Analyzer', () => {

diff --git a/...sumer_analytics/persistence/describeDB.ts → test/consumer/persistence/describeDB.ts b/...sumer_analytics/persistence/describeDB.ts → test/consumer/persistence/describeDB.ts
diff --git a/...nsumer_analytics/persistence/seed.spec.ts → test/consumer/persistence/seed.spec.ts b/...nsumer_analytics/persistence/seed.spec.ts → test/consumer/persistence/seed.spec.ts
@@ -1,5 +1,5 @@
 import describeDB from './describeDB'
-import analizer from '../../../src/consumer_analytics/persistence/analyzer'
+import analizer from '../../../src/consumer/persistence/analyzer'
 
 describeDB('Seed', () => {
   test('Running on full db', async () => {

diff --git a/test/consumer_analytics/session.spec.ts → test/consumer/session.spec.ts b/test/consumer_analytics/session.spec.ts → test/consumer/session.spec.ts
@@ -1,4 +1,4 @@
-import sessionBehaviour, { Session } from '../../src/consumer_analytics/models/session'
+import sessionBehaviour, { Session } from '../../src/consumer/models/session'
 import { newContext, newSolution, unknownSolution as solution } from './utils'
 import { CompleteSolution } from '../../src/models/solution'
 

diff --git a/test/consumer_analytics/trial.spec.ts → test/consumer/trial.spec.ts b/test/consumer_analytics/trial.spec.ts → test/consumer/trial.spec.ts
@@ -1,5 +1,5 @@
 import { StaticAnalysis } from '../../src/models/staticAnalysis'
-import trialBehaviour, { Trial } from '../../src/consumer_analytics/models/trial'
+import trialBehaviour, { Trial } from '../../src/consumer/models/trial'
 import { newTrial, successSolution, failSolution, unknownSolution, newSolution, after, expectIntervalTimestamp } from './utils'
 import { staticAnalysis1 } from './experience.spec'
 

diff --git a/test/consumer_analytics/utils.ts → test/consumer/utils.ts b/test/consumer_analytics/utils.ts → test/consumer/utils.ts
@@ -1,9 +1,9 @@
 import * as mongoose from 'mongoose'
-import { connectDB } from '../../src/consumer_analytics/persistence/connect'
+import { connectDB } from '../../src/consumer/persistence/connect'
 import { CompleteSolution as Solution } from '../../src/models/solution'
-import { initialize, IntervalTimestamp } from '../../src/consumer_analytics/models/utils'
-import trialBehaviour, { Trial } from '../../src/consumer_analytics/models/trial'
-import experienceBehaviour, { Experience } from '../../src/consumer_analytics/models/experience'
+import { initialize, IntervalTimestamp } from '../../src/consumer/models/utils'
+import trialBehaviour, { Trial } from '../../src/consumer/models/trial'
+import experienceBehaviour, { Experience } from '../../src/consumer/models/experience'
 import { StaticAnalysis } from '../../src/models/staticAnalysis'
 
 // SERVER

diff --git a/tsconfig.json b/tsconfig.json
@@ -9,6 +9,5 @@
   },
   "exclude": [
     "test",
-    "src/consumer_analytics"
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,5 @@ @@
       },
       "exclude": [
         "test",
-        "src/consumer_analytics"
       ]
     }