diff --git a/README.md b/README.md index 68ecae3216fbd1411b4b7747f769859d8b0c0348..78523ff76c0ffa920a9f74f68631e2895b44eeb5 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,8 @@ Currently they are still mostly the original ATDB diagrams. They will be adapted Datamodel: * https://drive.google.com/file/d/1v5hMBQS0jT8DQJwySVISfRa1zF4o0fCQ/view?usp=sharing + + Workflow/Status Diagram: * https://drive.google.com/file/d/1BCrIwUfacOVqSN73VIIjUuBCXNYA67iK/view?usp=sharing @@ -32,6 +34,8 @@ Workflow/Status Diagram: Deployment Diagram: * https://drive.google.com/file/d/1_j9Fp505pZTxcmzAEdgftdPkoIFrKfAX/view?usp=sharing + + ### Manual deploy in Docker For the `master' branch there is a CI/CD pipeline in place which builds and deploys the backend at https://sdc.astron.nl:5554/atdb/ The deploy step requires pushing the 'play' button in the gitlab pipelines section. @@ -74,7 +78,7 @@ This is how to do that manually for a persistent database in a Docker container. ### Original ATDB diagrams -These diagrams can be used as guidance to the original ATDB services, which can be harvested for functionality +These diagrams can be used as inspiration and guidance to the original ATDB services, which can be harvested for functionality.  diff --git a/atdb/Dockerfile b/atdb/Dockerfile index d82909750244726df4688a39d8636faa4e66e6b5..cd7fc64720247d4924af5403c714d7087234b627 100644 --- a/atdb/Dockerfile +++ b/atdb/Dockerfile @@ -12,22 +12,7 @@ RUN \ pip install -r requirements/prod.txt && \ apk --purge del .build-deps -# collect static files -# RUN exec python manage.py collectstatic --settings=atdb.settings.docker_sdc --noinput - # run gunicorn CMD exec gunicorn atdb.wsgi_docker_sdc:application --bind 0.0.0.0:8000 --workers 3 - -# build the image like this: -# docker build -t atdb-ldv:latest . - -# run the container from here, like this: -# docker run -d --name atdb-ldv -p 8010:8000 --restart always atdb-ldv:latest - -# log into the container -# docker exec -it atdb-ldv sh - -# tail logs -# docker exec -it atdb-ldv tail -f logs/atdb.log diff --git a/atdb/docs/ATDB-LDV - Deployment Diagram.png b/atdb/docs/ATDB-LDV - Deployment Diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..0cc653e0acfd30aa24152f29dcc0703f390d8000 Binary files /dev/null and b/atdb/docs/ATDB-LDV - Deployment Diagram.png differ diff --git a/atdb/docs/ATDB-LDV Data Model.png b/atdb/docs/ATDB-LDV Data Model.png new file mode 100644 index 0000000000000000000000000000000000000000..92fc76bba762b56b46e351d2c4303dffe6617b08 Binary files /dev/null and b/atdb/docs/ATDB-LDV Data Model.png differ diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 84b6251671125227385ec1a6b0b27ccfaf2c099e..c6eedf595612dbba0d1fecd959258494d396014f 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -82,7 +82,7 @@ class Observation(TaskObject): field_dec = models.FloatField('field_dec', null = True) skip_auto_ingest = models.BooleanField(default=False) - progress = models.CharField(max_length=40, default="", null=True) + progress = models.CharField(max_length=40, default="0%", null=True, blank=True) # this translates a view-name (from urls.py) back to a url, to avoid hardcoded url's in the html templates # bad : <td><a href="/atdb/observations/{{ observation.id }}/" target="_blank">{{ observation.taskID }} </a> </td> diff --git a/atdb/taskdatabase/serializers.py b/atdb/taskdatabase/serializers.py index f6b5a71a4beb6cd4c9c8c9462e7f36ddb11d3ce6..9698770316c3d543b53acfcabb289621926669fd 100644 --- a/atdb/taskdatabase/serializers.py +++ b/atdb/taskdatabase/serializers.py @@ -57,5 +57,5 @@ class ObservationSerializer(serializers.ModelSerializer): 'generated_dataproducts', 'data_location', 'node', 'skip_auto_ingest','observing_mode', - 'quality','progress') + 'quality','metadata','progress')