Feature/update types

Dockerfile

@@ -13,7 +13,7 @@ RUN npm install -g npm && \
 COPY ./tsconfig*.json ./
 COPY ./nest-cli.json ./
 COPY ./src ./src
-COPY ./packages ./packages
+# COPY ./packages ./packages
 COPY ./test ./test
 
 RUN npm run build

docker-compose.network.yml

@@ -33,7 +33,7 @@ services:
       - redis
     volumes:
       - ./src:/app/src
-      - ./packages:/app/packages
+      # - ./packages:/app/packages
       - ./package.json:/app/package.json
     command: npm run start:network
 
@@ -46,6 +46,8 @@ services:
       - POSTGRES_DB=devdatabase
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=devpass
+    ports:
+      - 5432:5432
     networks:
       - cluster
 
@@ -70,12 +72,60 @@ services:
   #     - pgadmin-network-data:/var/lib/pgadmin
   #   networks:
   #     - cluster
+
+  pgadmin:
+    # Config adapted from: https://stackoverflow.com/a/77519799/10914922
+    image: dpage/pgadmin4
+    restart: unless-stopped
+    attach: false
+    ports:
+      - '8888:80'
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=admin@example.com
+      - PGADMIN_DEFAULT_PASSWORD=changeme
+      - PGADMIN_CONFIG_SERVER_MODE=False
+      - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
+    user: root
+    depends_on:
+      - postgres
+    entrypoint: /bin/sh -c "chmod 600 /pgpass; /entrypoint.sh;"
+    volumes:
+      - pgadmin-jukebox-dev:/var/lib/pgadmin
+    configs:
+      - source: servers.json
+        target: /pgadmin4/servers.json
+      - source: pgpass
+        target: /pgpass
+
+    networks:
+      - cluster
 
 volumes:
   jukebox-network-pg-data:
-  pgadmin-network-data:
+  pgadmin-jukebox-dev:
 
 networks:
   cluster:
     name: clubs_cluster
     external: true
+
+configs:
+  pgpass:
+    content: jbx-network-db:5432:*:devuser:devpass
+  servers.json:
+    content: |
+      {
+        "Servers": {
+            "1": {
+                "Group": "Servers",
+                "Name": "Docker",
+                "Host": "jbx-network-db",
+                "Port": 5432,
+                "MaintenanceDB": "devdatabase",
+                "Username": "devuser",
+                "PassFile": "/pgpass",
+                "SSLMode": "prefer",
+                "Favorite": true
+            }
+        }
+      }

docker-compose.yml

@@ -35,18 +35,18 @@ services:
     container_name: jbx-dev-db
     volumes:
       - jukebox-pg-data:/var/lib/postgresql/data
-      # - ./scripts/create-multiple-postgres-databases:/docker-entrypoint-initdb.d
+      - ./scripts/create-multiple-postgres-databases.sh:/docker-entrypoint-initdb.d/create-multiple-postgres-databases.sh
     environment:
-      - POSTGRES_DB=devdatabase
-      # - POSTGRES_MULTIPLE_DATABASES=devdatabase,test
+      # - POSTGRES_DB=devdatabase
+      - POSTGRES_MULTIPLE_DATABASES=devdatabase,test
       - POSTGRES_USER=devuser
       - POSTGRES_PASSWORD=devpass
 
   redis:
     image: redis:alpine
     container_name: jbx-redis
-    ports:
-      - 6379:6379
+    # ports:
+    #   - 6379:6379
 
 volumes:
   jukebox-pg-data:

package.json

@@ -16,13 +16,14 @@
     "start:prod": "node dist/src/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
     "lint:fix": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest --detectOpenHandles",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --detectOpenHandles --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest -c test/jest-e2e.json --detectOpenHandles",
+    "test": "NODE_ENV=test jest --detectOpenHandles",
+    "test:watch": "NODE_ENV=test jest --watch",
+    "test:cov": "NODE_ENV=test jest --detectOpenHandles --coverage",
+    "test:debug": "NODE_ENV=test node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "NODE_ENV=test jest -c test/jest-e2e.json --detectOpenHandles",
     "seed": "ts-node -r tsconfig-paths/register src/scripts/seed.ts",
     "prepare": "husky"
+
   },
   "dependencies": {
     "@nestjs/axios": "^4.0.1",