From 317b02def03c850751f10b68b58325f2eb567b8c Mon Sep 17 00:00:00 2001
From: AndiMajore <andi.majore@googlemail.com>
Date: Wed, 16 Nov 2022 14:51:26 +0100
Subject: [PATCH] fixing backend routes
Former-commit-id: a37f5f815d0b80915d12a0ff68fd7e5847b246a2 [formerly 96dd8112ffbe332ac66f83a9aba11b48506bf7dc]
Former-commit-id: e827e385961c19295dd09db39c2733afdab015ae
---
drugstone/settings/celery_schedule.py | 3 ++-
drugstone/urls.py | 2 +-
drugstone/views.py | 19 ++++++++++++++-----
scripts/docker-entrypoint.sh | 2 +-
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/drugstone/settings/celery_schedule.py b/drugstone/settings/celery_schedule.py
index b066327..83ee1d3 100644
--- a/drugstone/settings/celery_schedule.py
+++ b/drugstone/settings/celery_schedule.py
@@ -3,6 +3,7 @@ from celery.schedules import crontab
CELERY_BEAT_SCHEDULE = {
'update_db': {
'task': 'drugstone.tasks.task_update_db_from_nedrex',
- 'schedule': crontab(day_of_week=1, hour=5, minute=0),
+ 'schedule': crontab(day_of_week=1, hour=6, minute=0),
+ # 'schedule': crontab(minute='*/1'),
},
}
diff --git a/drugstone/urls.py b/drugstone/urls.py
index 886dbdd..7e0d16a 100755
--- a/drugstone/urls.py
+++ b/drugstone/urls.py
@@ -34,7 +34,7 @@ urlpatterns = [
path('adjacent_drugs/', adjacent_drugs),
path('adjacent_disorders/', adjacent_disorders),
path('tissue_expression/', TissueExpressionView.as_view()),
- path('tissue_max_expression/', get_max_tissue_expression()),
+ path('tissue_max_expression/', get_max_tissue_expression),
path('tissues/', TissueView.as_view()),
path('admin/', admin.site.urls),
path('create_network', create_network),
diff --git a/drugstone/views.py b/drugstone/views.py
index 5ddea2f..3175ef6 100755
--- a/drugstone/views.py
+++ b/drugstone/views.py
@@ -653,21 +653,30 @@ class TissueView(APIView):
return Response(TissueSerializer(many=True).to_representation(tissues))
-
class TissueExpressionView(APIView):
"""
Expression of host proteins in tissues.
"""
+ def get(self, request) -> Response:
+ tissue = Tissue.objects.get(id=request.query_params.get('tissue'))
+ proteins = request.query_params.get('proteins')
+ token = request.query_params.get('token')
+ return self.get_tissue_expression(tissue, proteins, token)
+
def post(self, request) -> Response:
tissue = Tissue.objects.get(id=request.data.get('tissue'))
+ proteins = request.data.get('proteins')
+ token = request.data.get('token')
+ return self.get_tissue_expression(tissue, proteins, token)
- if request.data.get('proteins'):
- ids = json.loads(request.data.get('proteins'))
+ def get_tissue_expression(self, tissue, proteins, token):
+ if proteins is not None:
+ ids = json.loads(proteins)
proteins = list(Protein.objects.filter(id__in=ids).all())
- elif request.data.get('token'):
+ elif token is not None:
proteins = []
- task = Task.objects.get(token=request.data['token'])
+ task = Task.objects.get(token=token)
result = task_result(task)
network = result['network']
node_attributes = result.get('node_attributes')
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index 3c90d86..43bf32d 100755
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -4,7 +4,7 @@ python3 manage.py makemigrations drugstone
python3 manage.py migrate
python3 manage.py createfixtures
python3 manage.py cleanuptasks
-#python3 manage.py populate_db --update -a
+python3 manage.py populate_db --update -a
python3 manage.py make_graphs
/usr/bin/supervisord -c "/etc/supervisor/conf.d/supervisord.conf"
--
GitLab