Merge pull request #51 from datasci4health/development

Development

Dockerfile

@@ -1,12 +1,21 @@
-FROM node:12
+FROM node:10
 
 WORKDIR /app
 
+COPY ./src/adonisjs .
+
+#RUN chown node:node /app
+
 RUN npm i npm
 RUN npm i -g @adonisjs/cli
 
-COPY ./src/adonisjs .
-
 RUN npm install
 
-CMD [ "npm", "start"]
+#RUN chown node:node /app
+
+#USER node
+
+#ENTRYPOINT ["tail", "-f", "/dev/null"]
+#CMD [ "npm", "start"]
+
+ENTRYPOINT ["./bootstrap.sh"]

README.md

@@ -119,10 +119,8 @@ adonis serve --debug        # starting server
 
 ### Running as Docker containers - Linux
 
-You can run a containerized instance of this project with its required services (e.g., database) using Docker. 
-Please refer to this [link](https://docs.docker.com/install/) for installing Docker. Then, try:
-
-```bash
+You can run a containerized instance of this project with its required services (e.g., database) using Docker. Please refer to this link for installing Docker. Then, try:
+```
 sudo apt-get install docker-compose -y  # installing docker-compose
 
 git clone https://github.com/datasci4health/harena-manager 
@@ -136,7 +134,6 @@ docker build . -t manager
 docker-compose -f docker-compose-dev.yml up
 ```
 
-
 ## Dependencies
 
 ### System-wide

docker-compose-dev.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
 
   harena-manager:
-    image: datasci4health/harena-manager:development
+    image: manager
     ports:
       - "10020:10020"
     environment:
@@ -22,15 +22,14 @@ services:
       - DB_USER=jacinto
       - DB_PASSWORD=jacinto
       - HASH_DRIVER=bcrypt
-    # env_file:      
-    #   - web-variables.env
     depends_on:
       - harena-manager-database
     restart: always  
     networks:
       - harena-manager
     volumes:
       - ./src/adonisjs:/app
+      - /app/node_modules
 
   harena-manager-database:
     image: mysql:5.7

src/adonisjs/app/Controllers/Http/v1/ArtifactController.js

@@ -46,7 +46,8 @@ class ArtifactController {
 			await file.move(fsPath, {name: artifactFileName, overwrite: false})
 
 			const artifact = new Artifact()
-			artifact.fs_path       = fsPath + artifactFileName 
+			artifact.id       = artifactID
+			artifact.fs_path       = fsPath + artifactFileName
 			artifact.relative_path = caseRelativePath + artifactFileName
 			artifact.case_id       = linkedCase != null ? linkedCase.uuid : linkedCase;
 			await auth.user.artifacts().save(artifact)

src/adonisjs/app/Controllers/Http/v1/CaseController.js

@@ -64,8 +64,9 @@ class CaseController {
       c.user_id = auth.user.id
 
       let cv = new CaseVersion()
+      cv.id = await uuidv4()
+
       cv.source = request.input('source')
-
       await c.versions().save(cv)
       await c.versions().fetch()
 
@@ -85,7 +86,7 @@ class CaseController {
 
       let cv = new CaseVersion()
       cv.source = request.input('source')
-
+        cv.id = await uuidv4()
       await c.versions().save(cv)
       await c.save() 
       return response.json(c)

src/adonisjs/app/Models/v1/Artifact.js

@@ -4,6 +4,9 @@
 const Model = use('Model')
 
 class Artifact extends Model {
+    static get incrementing () {
+        return false
+    }
 
     user() {
         return this.belongsTo('App/Models/v1/User');

src/adonisjs/app/Models/v1/CaseVersion.js

@@ -4,6 +4,10 @@
 const Model = use('Model')
 
 class CaseVersion extends Model {
+    static get incrementing () {
+        return false
+    }
+
     case() {
         return this.belongsTo('App/Models/v1/Case');
     }

src/adonisjs/app/Models/v1/Permission.js

@@ -0,0 +1,12 @@
+'use strict'
+
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model')
+
+class Permission extends Model {
+    static get incrementing () {
+        return false
+    }
+}
+
+module.exports = Permission

src/adonisjs/app/Models/v1/Role.js

@@ -0,0 +1,12 @@
+'use strict'
+
+/** @type {typeof import('@adonisjs/lucid/src/Lucid/Model')} */
+const Model = use('Model')
+
+class Role extends Model {
+    static get incrementing () {
+        return false
+    }
+}
+
+module.exports = Role

src/adonisjs/app/Models/v1/User.js

@@ -8,6 +8,10 @@ const Model = use('Model')
 const Database = use('Database')
 
 class User extends Model {
+    static get incrementing () {
+        return false
+    }
+
     static async getAuthenticatedUser(email){
         return await Database.table('users').select('username', 'email').where('email', email)
     }

src/adonisjs/database/factory.js

@@ -19,7 +19,8 @@ Factory.blueprint('App/Models/v1/User', async (faker, i, data) => {
   return {
     username:  faker.username(),
     email: faker.email(),
-    password: await Hash.make(faker.password())
+    password: await Hash.make(faker.password()),
+    id: data.id
   }
 })
 
@@ -32,7 +33,8 @@ Factory.blueprint('App/Models/v1/Case', (faker, i, data) => {
 
 Factory.blueprint('App/Models/v1/CaseVersion', async (faker, i, data) => {
   return {
-    source: data.source
+    source: data.source,
+    id: data.id
   }
 })