Merge pull request #147 from TKOaly/lolasd123

Fixes

Author: ArktinenKarpalo

.env.example

@@ -3,5 +3,4 @@ POSTGRES_PASSWORD=abcd
 POSTGRES_DB=abcd
 PORT=4040
 NODE_ENV=development
-JWT_SECRET=nottellingyou
-JWT_ADMIN_SECRET=tellingnoone
+JWT_SECRET=nottellingyou

.github/workflows/node.yml

@@ -50,7 +50,6 @@ jobs:
                   DB_NAME: rv
                   DB_PORT: 5432
                   JWT_SECRET: unsecure1
-                  JWT_ADMIN_SECRET: unsecure2
             - name: Generate the code coverage report
               uses: codecov/codecov-action@v3
     lint:

.vscode/launch.json

@@ -7,44 +7,20 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Mocha test all",
-			"runtimeExecutable": "docker-compose",
-			"runtimeArgs": [
-				"run",
-				"-p",
-				"9229:9229",
-				"rv-backend",
-				"node_modules/.bin/mocha",
-				"--inspect-brk=0.0.0.0:9229",
-				"--colors",
-				"--exit",
-				"test"
-			],
-			"port": 9229,
-			"timeout": 20000,
-			"remoteRoot": "/usr/src/app",
-			"localRoot": "${workspaceFolder}"
+			"name": "Test all",
+			"runtimeExecutable": "sh",
+			"runtimeArgs": ["-c", ". test/test.env && node --test test/"],
+			"localRoot": "${workspaceFolder}",
+			"console": "integratedTerminal"
 		},
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Mocha test current file",
-			"runtimeExecutable": "docker-compose",
-			"runtimeArgs": [
-				"run",
-				"-p",
-				"9229:9229",
-				"rv-backend",
-				"node_modules/.bin/mocha",
-				"--inspect-brk=0.0.0.0:9229",
-				"--colors",
-				"--exit",
-				"${relativeFile}"
-			],
-			"port": 9229,
-			"timeout": 20000,
-			"remoteRoot": "/usr/src/app",
-			"localRoot": "${workspaceFolder}"
+			"name": "Test current file",
+			"runtimeExecutable": "sh",
+			"runtimeArgs": ["-c", ". test/test.env && node --test ${relativeFile}"],
+			"localRoot": "${workspaceFolder}",
+			"console": "integratedTerminal"
 		}
 	]
 }

README.md

@@ -138,7 +138,7 @@ You can use a custom [.env](.env) file to override the environment variables set
 | Environment Variable                          | Description                                                                                                                                                                         |
 | --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB | Postgres database configuration                                                                                                                                                     |
-| JWT_SECRET, JWT_ADMIN_SECRET                  | Secret keys for signing JWT tokens. **Do not** use default values in production! The security of authentication will depend on this key being kept secret, so treat it accordingly. |
+| JWT_SECRET                 | Secret keys for signing JWT tokens. **Do not** use default values in production! The security of authentication will depend on this key being kept secret, so treat it accordingly. |
 | PORT                                          | Port the backend is served at                                                                                                                                                       |
 | NODE_ENV                                      | Environment for Node, can be one of `development`, `test` or `production`.                                                                                                          |
 

docker-compose.yml

@@ -19,7 +19,7 @@ services:
             - DB_NAME=rv
             - DB_PORT=5432
             - JWT_SECRET=unsecure1
-            - JWT_ADMIN_SECRET=unsecure2
+            - RV_TERMINAL_SECRET=unsecure
         volumes:
             - ./src:/usr/src/app/src
             - ./test:/usr/src/app/test
@@ -31,7 +31,7 @@ services:
         ports:
             - 127.0.0.1:5432:5432
         volumes:
-            - rv-postgres-data:/var/lib/postgresql/data
+            - ./data/rv-postgres-data:/var/lib/postgresql/data
             - ./db-init-scripts:/docker-entrypoint-initdb.d
         environment:
             - POSTGRES_USER=rvadmin

knexfile.js

@@ -9,10 +9,10 @@ const config = {
 			port: process.env.DB_PORT,
 		},
 		migrations: {
-			directory: import.meta.dirname + '/src/db/migrations',
+			directory: import.meta.dirname + '/built/src/db/migrations',
 		},
 		seeds: {
-			directory: import.meta.dirname + '/src/db/seeds/development',
+			directory: import.meta.dirname + '/built/src/db/seeds/development',
 		},
 	},
 
@@ -43,10 +43,10 @@ const config = {
 			port: process.env.DB_PORT,
 		},
 		migrations: {
-			directory: import.meta.dirname + '/src/db/migrations',
+			directory: import.meta.dirname + '/built/src/db/migrations',
 		},
 		seeds: {
-			directory: import.meta.dirname + '/src/db/seeds/production',
+			directory: import.meta.dirname + '/built/src/db/seeds/production',
 		},
 	},
 };

migrate.sh

@@ -0,0 +1,4 @@
+#For migration run these commands, tunnel mysql from haba port 3306, after these run knex db-migrate 
+#git clone [email protected]:dimitri/pgloader.git
+#sudo docker build ./pgloader -t pgloader
+#sudo docker run -it --network="host" --rm -v ./rv.load:/rv.load pgloader:latest bash