From 1fff18567ef83206936ddfde3e0334b71d473e78 Mon Sep 17 00:00:00 2001 From: vid podpecan Date: Fri, 13 Dec 2019 12:11:12 +0100 Subject: [PATCH] few updates towards BrAPI 1.3 --- brapi/settings.py | 2 +- jsonapi/models.py | 15 ++++++++++++--- jsonapi/serializers.py | 4 ++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/brapi/settings.py b/brapi/settings.py index da964ab..933346d 100644 --- a/brapi/settings.py +++ b/brapi/settings.py @@ -52,6 +52,7 @@ MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', + 'iprestrict.middleware.IPRestrictMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -59,7 +60,6 @@ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'iprestrict.middleware.IPRestrictMiddleware', ] ROOT_URLCONF = 'brapi.urls' diff --git a/jsonapi/models.py b/jsonapi/models.py index 0b854e8..59cabe8 100644 --- a/jsonapi/models.py +++ b/jsonapi/models.py @@ -124,12 +124,18 @@ class Location(models.Model): abbreviation = models.TextField(blank=True, verbose_name=' abbreviation') countryCode = models.TextField(blank=True, verbose_name=' countryCode') countryName = models.TextField(blank=True, verbose_name=' countryName') - latitude = models.TextField(blank=True, verbose_name=' latitude') # This field type is a guess. - longitude = models.TextField(blank=True, verbose_name=' longitude') # This field type is a guess. - altitude = models.TextField(blank=True, verbose_name=' altitude') # This field type is a guess. + latitude = models.TextField(blank=True, verbose_name=' latitude') + longitude = models.TextField(blank=True, verbose_name=' longitude') + altitude = models.TextField(blank=True, verbose_name=' altitude') instituteName = models.TextField(blank=True, verbose_name=' instituteName') instituteAddress = models.TextField(blank=True, verbose_name=' instituteAddress') + # added 13.12.2019 + documentationURL = models.TextField(blank=True, verbose_name=' documentationURL') + locationName = models.TextField(blank=True, verbose_name=' locationName') + locationType = models.TextField(blank=True, verbose_name=' locationType') + + def __str__(self): return '{}: {}'.format(self.pk, self.name) @@ -328,6 +334,9 @@ class Study(models.Model): lastUpdateVersion = models.TextField(blank=True, verbose_name=' lastUpdateVersion') lastUpdateTimestamp = models.TextField(blank=True, verbose_name=' lastUpdateTimestamp') + # added 13.12.2019 + documentationURL = models.TextField(blank=True, verbose_name=' documentationURL') + def __str__(self): return '{}: {}'.format(self.pk, self.name) diff --git a/jsonapi/serializers.py b/jsonapi/serializers.py index d0fdc17..8d1a772 100644 --- a/jsonapi/serializers.py +++ b/jsonapi/serializers.py @@ -264,6 +264,10 @@ class Meta: class LocationSerializer(serializers.ModelSerializer): locationType = serializers.CharField(source='type') additionalInfo = serializers.SerializerMethodField() + latitude = serializers.FloatField() + longitude = serializers.FloatField() + altitude = serializers.IntegerField() + documentationURL = serializers.URLField() def get_additionalInfo(self, obj): return collect_additional_info(obj.locationadditionalinfo_set.all())