Implement get list of TrainingJobs

Implemented get on TrainingJobs.

Change-Id: I20d0f5748545804b28badc7290055a0731ee99c2
Signed-off-by: subhash kumar singh <subh.singh@samsung.com>

diff --git a/trainingmgr/controller/trainingjob_controller.py b/trainingmgr/controller/trainingjob_controller.py
index d0edb8e..574de25 100644 (file)
--- a/trainingmgr/controller/trainingjob_controller.py
+++ b/trainingmgr/controller/trainingjob_controller.py
@@ -17,7 +17,7 @@
 # ==================================================================================
 from flask import Blueprint, jsonify, request
 from trainingmgr.common.trainingmgr_config import TrainingMgrConfig
-from trainingmgr.service.training_job_service import delete_training_job, create_training_job, get_training_job
+from trainingmgr.service.training_job_service import delete_training_job, create_training_job, get_training_job, get_trainining_jobs
 
 training_job_controller = Blueprint('training_job_controller', __name__)
 LOGGER = TrainingMgrConfig().logger
@@ -53,6 +53,12 @@ def create_trainingjob():
             'message': str(e)
         }), 500
 
+@training_job_controller.route('/training-jobs/', methods=['GET'])
+def get_trainingjobs():
+    LOGGER.debug(f'get the trainingjobs')
+    resp = get_trainining_jobs()
+    return jsonify(resp), 200
+
 @training_job_controller.route('/training-jobs/<int:training_job_id>', methods=['GET'])
 def get_trainingjob(training_job_id):
     LOGGER.debug(f'get the trainingjob correspoinding to id: {training_job_id}')

diff --git a/trainingmgr/db/trainingjob_db.py b/trainingmgr/db/trainingjob_db.py
index bff0d6c..0895b6d 100644 (file)
--- a/trainingmgr/db/trainingjob_db.py
+++ b/trainingmgr/db/trainingjob_db.py
@@ -317,6 +317,11 @@ def delete_trainingjob_by_id(id: int):
         db.session.rollback()
         raise DBException(f'{DB_QUERY_EXEC_ERROR} : {str(e)}' )
 
-def get_trainingjob(id: int):
-    tj = db.session.query(TrainingJob).get(id)
+def get_trainingjob(id: int=None):
+    if id is not None:
+        tj = TrainingJob.query.filter(TrainingJob.id==id).one()
+        return tj
+    else:
+        tjs = TrainingJob.query.all()
+        return tjs
     return tj

diff --git a/trainingmgr/service/training_job_service.py b/trainingmgr/service/training_job_service.py
index 285722c..da569fa 100644 (file)
--- a/trainingmgr/service/training_job_service.py
+++ b/trainingmgr/service/training_job_service.py
@@ -19,9 +19,17 @@ from trainingmgr.db.trainingjob_db import delete_trainingjob_by_id, create_train
 from trainingmgr.common.exceptions_utls import DBException
 from trainingmgr.schemas import TrainingJobSchema
 
+trainingJobSchema = TrainingJobSchema()
+trainingJobsSchema = TrainingJobSchema(many=True)
+
 def get_training_job(training_job_id: int):
     tj =get_trainingjob(training_job_id)
-    return TrainingJobSchema().dump(tj)
+    return trainingJobSchema.dump(tj)
+
+def get_trainining_jobs():
+    tjs = get_trainingjob()
+    result = trainingJobsSchema.dump(tjs)
+    return result
 
 def create_training_job(data):
     create_trainingjob(data)