Merge pull request #8 from ABI-Deployment-Thesis/ruiar/change-db-fields

feat(db): change db fields
ABI-Deployment-Thesis · Aug 31, 2024 · 94bd566 · 94bd566
2 parents 9b1fab3 + c80001b
commit 94bd566
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/grpc/controllers/runner.controller.js b/grpc/controllers/runner.controller.js
@@ -6,15 +6,15 @@ async function UpdateRunninState(call, callback) {
     try {
         logger.debug(`Received gRPC call: ${JSON.stringify(call.request)}`)
 
-        const { run_id, state, container_id, container_exit_code, logs } = call.request
+        const { run_id, state, result, logs } = call.request
 
         if (!mongoose.Types.ObjectId.isValid(run_id)) {
             logger.error(`model_id ${run_id} not valid`)
             return callback(null, { resolved: true, err: '' })
         }
 
         const filter = { _id: run_id }
-        const update = { state: state, container_id: container_id, container_exit_code: container_exit_code, result: logs }
+        const update = { state: state, result: result, logs: logs }
 
         await ModelRun.findOneAndUpdate(filter, update)
         callback(null, { resolved: true, err: '' })

diff --git a/grpc/protos/ModelRunnerService.proto b/grpc/protos/ModelRunnerService.proto
@@ -7,9 +7,8 @@ service ModelRunnerService {
 message StateRequest {
   string run_id = 1;
   string state = 2;
-  string container_id = 3;
-  int32 container_exit_code = 4;
-  string logs = 5;
+  string result = 3;
+  string logs = 4;
 }
 
 message StateResponse {

diff --git a/models/modelRun.js b/models/modelRun.js
@@ -31,18 +31,22 @@ const ModelRun = new Schema({
         required: true,
         default: 'queue'
     },
-    container_id: {
+    result: {
         type: String,
-        required: false
-    },
-    container_exit_code: {
-        type: Number,
-        required: false
+        required: false,
+        default: ''
     },
-    result: {
+    logs: {
         type: String,
-        required: false
+        required: false,
+        default: ''
     }
-}, { timestamps: true, versionKey: false })
+}, {
+    timestamps: {
+        createdAt: 'created_at',
+        updatedAt: 'updated_at'
+    },
+    versionKey: false
+})
 
 module.exports = model('model_run', ModelRun)