few updates towards BrAPI 1.3

vpodpecan · Dec 13, 2019 · 1fff185 · 1fff185
1 parent a76c4d5
commit 1fff185
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/brapi/settings.py b/brapi/settings.py
@@ -52,14 +52,14 @@
 
 MIDDLEWARE = [
     'corsheaders.middleware.CorsMiddleware',
+    'iprestrict.middleware.IPRestrictMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     '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
@@ -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
@@ -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())