Merge pull request #34 from AERPAW-Platform-Control/33-v1-to-v2-migra…

…tion

v1 to v2 migration

.gitignore

@@ -24,6 +24,10 @@ portal/apps/users/fixtures/
 !portal/apps/users/fixtures/aerpaw_roles.json
 dumpdata/
 !dumpdata/.gitkeep
+v1-to-v2-migration/v1-data/dumpdata
+!v1-to-v2-migration/v1-data/dumpdata/.gitkeep
+v1-to-v2-migration/v2-data/fixtures
+!v1-to-v2-migration/v2-data/fixtures/.gitkeep
 
 ### macOS files
 .idea

portal/apps/experiments/api/viewsets.py

@@ -383,7 +383,7 @@ def resources(self, request, *args, **kwargs):
         - user is_experiment_member
         """
         experiment = get_object_or_404(self.get_queryset(), pk=kwargs.get('pk'))
-        if experiment.is_creator(request.user) or experiment.is_member(request.user):
+        if experiment.is_creator(request.user) or experiment.is_member(request.user) or request.user.is_operator():
             if str(request.method).casefold() in ['put', 'patch']:
                 if request.data.get('experiment_resources') or isinstance(request.data.get('experiment_resources'),
                                                                           list):
@@ -491,7 +491,7 @@ def membership(self, request, *args, **kwargs):
         - user is_experiment_member
         """
         experiment = get_object_or_404(self.get_queryset(), pk=kwargs.get('pk'))
-        if experiment.is_creator(request.user) or experiment.is_member(request.user):
+        if experiment.is_creator(request.user) or experiment.is_member(request.user) or request.user.is_operator():
             if str(request.method).casefold() in ['put', 'patch', 'post']:
                 if request.data.get('experiment_members') or isinstance(request.data.get('experiment_members'), list):
                     if experiment.is_retired:
@@ -1061,17 +1061,17 @@ def get_queryset(self):
             queryset = CanonicalExperimentResource.objects.filter(
                 experiment__id=experiment_id,
                 resource__id=resource_id
-            ).order_by('node_display_name').distinct()
+            ).order_by('experiment_node_number').distinct()
         elif experiment_id:
             queryset = CanonicalExperimentResource.objects.filter(
                 experiment__id=experiment_id
-            ).order_by('node_display_name').distinct()
+            ).order_by('experiment_node_number').distinct()
         elif resource_id:
             queryset = CanonicalExperimentResource.objects.filter(
                 resource__id=resource_id
-            ).order_by('node_display_name').distinct()
+            ).order_by('experiment_node_number').distinct()
         else:
-            queryset = CanonicalExperimentResource.objects.filter().order_by('node_display_name').distinct()
+            queryset = CanonicalExperimentResource.objects.filter().order_by('experiment_node_number').distinct()
         return queryset
 
     def list(self, request, *args, **kwargs):

portal/apps/experiments/models.py

@@ -207,7 +207,8 @@ class NodeType(models.TextChoices):
 
     class NodeUhd(models.TextChoices):
         ONE_THREE_THREE = '1.3.3', _('1.3.3')
-        ONE_FOUR = '1.4', _('1.4')
+        ONE_FOUR_ZERO = '1.4.0', _('1.4.0')
+        ONE_FOUR_TWO = '1.4.2', _('1.4.2')
 
     class NodeVehicle(models.TextChoices):
         VEHICLE_UAV = 'vehicle_uav', _('Vehicle UAV')
@@ -230,7 +231,7 @@ class NodeVehicle(models.TextChoices):
     node_uhd = models.CharField(
         max_length=255,
         choices=NodeUhd.choices,
-        default=NodeUhd.ONE_THREE_THREE
+        default=NodeUhd.ONE_FOUR_TWO
     )
     node_vehicle = models.CharField(
         max_length=255,

portal/apps/experiments/views.py

@@ -168,7 +168,7 @@ def experiment_detail(request, experiment_id):
                 res = r.list(request=request)
                 if res.data:
                     resources.append(res.data.get('results')[0])
-            resources.sort(key=lambda x: x.get('node_display_name'))
+            resources.sort(key=lambda x: x.get('experiment_node_number'))
         except Exception as exc:
             resources = []
             message = exc

portal/server/settings.py

@@ -99,7 +99,7 @@
     ],
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
     # 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
-    'PAGE_SIZE': 5,
+    'PAGE_SIZE': 10,
     # metadata settings
     'DEFAULT_METADATA_CLASS': 'portal.server.drf_settings.MinimalMetadata',
 }