dataset images, json validation, tests

localcosmos_server/api/serializers.py

@@ -20,7 +20,7 @@ class LocalcosmosUserSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = User
-        fields = ('id', 'uuid', 'username', 'first_name', 'last_name', 'email')
+        fields = ('uuid', 'username', 'first_name', 'last_name', 'email')
 
 
 class RegistrationSerializer(serializers.ModelSerializer):

localcosmos_server/datasets/api/examples.py

@@ -0,0 +1,23 @@
+import os, json, localcosmos_server
+from localcosmos_server.tests.common import DataCreator
+lc_path = os.path.dirname(localcosmos_server.__file__)
+
+observation_form_json_path = os.path.join(lc_path, 'tests/data_for_tests/observation_form.json')
+
+def get_observation_form_example():
+
+    with open(observation_form_json_path, 'rb') as observation_form_file:
+        observation_form = json.loads(observation_form_file.read())
+
+    return observation_form
+
+
+def get_dataset_data_example():
+
+    observation_form_json = get_observation_form_example()
+
+    data_creator = DataCreator()
+
+    data = data_creator(observation_form_json=observation_form_json)
+    return data
+

localcosmos_server/datasets/api/permissions.py

@@ -27,9 +27,9 @@ def has_permission(self, request, view):
             app_state = 'review'
 
         app_settings = app.get_settings(app_state=app_state)
-
-        allow_anonymous_observations = app_settings['OPTIONS'].get('allowAnonymousObservations', False)
 
+        allow_anonymous_observations = app_settings['OPTIONS'].get('allowAnonymousObservations', False)
+
         if allow_anonymous_observations == False and request.user.is_authenticated == False:
             return False