#35 Move Prisma to Odyssey base

Northeastern-Electric-Racing · Sep 23, 2023 · 53bc32f · 53bc32f
1 parent 015682c
commit 53bc32f
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 154 deletions.
diff --git a/scylla-server/Dockerfile b/scylla-server/Dockerfile
@@ -16,11 +16,8 @@ RUN git init
 RUN git submodule add -f https://github.com/Northeastern-Electric-Racing/Odyssey-Base.git ./src/odyssey-base && \
     git submodule update --init --recursive
 
-RUN npx [email protected] generate
-
-RUN npx [email protected] migrate deploy
-
-RUN npm i --save-dev @types/ws
+RUN npm run prisma:generate && \
+    npm run prisma:migrate
 
 RUN npm run build
 

diff --git a/scylla-server/package.json b/scylla-server/package.json
@@ -27,11 +27,10 @@
     "ws": "8.14.1"
   },
   "prisma": {
-    "schema": "./src/prisma/schema.prisma"
+    "schema": "./src/odyssey-base/src/prisma/schema.prisma"
   },
   "devDependencies": {
     "@types/jest": "^29.5.4",
-    "@types/ws": "8.5.5",
     "prisma": "^5.2.0"
   }
 }
diff --git a/scylla-server/src/odyssey-base b/scylla-server/src/odyssey-base
diff --git a/scylla-server/src/prisma/migrations/20230912210925_init/migration.sql b/scylla-server/src/prisma/migrations/20230912210925_init/migration.sql
diff --git a/scylla-server/src/prisma/migrations/migration_lock.toml b/scylla-server/src/prisma/migrations/migration_lock.toml
diff --git a/scylla-server/src/prisma/prisma-client.ts b/scylla-server/src/prisma/prisma-client.ts
diff --git a/scylla-server/src/prisma/schema.prisma b/scylla-server/src/prisma/schema.prisma
diff --git a/scylla-server/src/services/dataTypes.services.ts b/scylla-server/src/services/dataTypes.services.ts
@@ -1,4 +1,4 @@
-import prisma from '../prisma/prisma-client';
+import prisma from '../odyssey-base/src/prisma/prisma-client';
 import { ResponseFunction } from '../utils/message-maps.utils';
 
 /**

diff --git a/scylla-server/src/services/driver.services.ts b/scylla-server/src/services/driver.services.ts
@@ -1,4 +1,4 @@
-import prisma from '../prisma/prisma-client';
+import prisma from '../odyssey-base/src/prisma/prisma-client';
 import { ResponseFunction } from '../utils/message-maps.utils';
 
 /**

diff --git a/scylla-server/src/services/systems.services.ts b/scylla-server/src/services/systems.services.ts
@@ -1,4 +1,4 @@
-import prisma from '../prisma/prisma-client';
+import prisma from '../odyssey-base/src/prisma/prisma-client';
 import { ResponseFunction } from '../utils/message-maps.utils';
 
 /**