Task LSMR-14: Renamed Run WorkRequest and WorkRequestRelation objects to ...Blueprint

.gitattributes

@@ -4245,6 +4245,7 @@ SAS/LSMR/src/lsmr/lsmrapp/__init__.py -text
 SAS/LSMR/src/lsmr/lsmrapp/admin.py -text
 SAS/LSMR/src/lsmr/lsmrapp/apps.py -text
 SAS/LSMR/src/lsmr/lsmrapp/migrations/0001_initial.py -text
+SAS/LSMR/src/lsmr/lsmrapp/migrations/0002_auto_20180712_1756.py -text
 SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py -text
 SAS/LSMR/src/lsmr/lsmrapp/migrations/CMakeLists.txt -text
 SAS/LSMR/src/lsmr/lsmrapp/migrations/__init__.py -text

SAS/LSMR/src/lsmr/lsmrapp/migrations/0003_populate.py

@@ -5,7 +5,7 @@ from ..populate import *
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('lsmrapp', '0002_auto_20180712_1621'),
+        ('lsmrapp', '0002_auto_20180712_1756'),
     ]
 
     operations = [ migrations.RunPython(populate_choices) ]

SAS/LSMR/src/lsmr/lsmrapp/models/specification.py

@@ -104,7 +104,7 @@ class DatatypeChoice(AbstractChoice):
         QUALITY = "quality"
 
 class DataformatChoice(AbstractChoice):
-    """Defines the model and predefined list of possible DataformatChoice's for WorkRequestRelationDraft and WorkRequestRelation.
+    """Defines the model and predefined list of possible DataformatChoice's for WorkRequestRelationDraft and WorkRequestRelationBlueprint.
     The items in the Choises class below are automagically populated into the database via a data migration."""
     class Choices(Enum):
         MEASUREMENTSET = "MeasurementSet"
@@ -214,11 +214,11 @@ class RunDraft(UserDefinedCommon):
     generator_source = ForeignKey(RunSet, on_delete=SET_NULL, null=True)
 
 
-class Run(SystemDefinedCommon):
+class RunBlueprint(SystemDefinedCommon):
     requirements_doc = JSONField()
     do_cancel = BooleanField()
     template = ForeignKey('RunTemplate', on_delete=SET_NULL, null=True)
-    draft = ForeignKey('RunDraft', related_name='related_runs', on_delete=CASCADE)
+    draft = ForeignKey('RunDraft', related_name='related_run_blueprint', on_delete=CASCADE)
 
 
 class WorkRequestDraft(UserDefinedCommon):
@@ -227,11 +227,11 @@ class WorkRequestDraft(UserDefinedCommon):
     copy_reason = ForeignKey('CopyReasonChoice', null=False, on_delete=CASCADE)
 
 
-class WorkRequest(SystemDefinedCommon):
+class WorkRequestBlueprint(SystemDefinedCommon):
     requirements_doc = JSONField()
     do_cancel = BooleanField()
     template = ForeignKey('WorkRequestTemplate', on_delete=SET_NULL, null=True)
-    draft = ForeignKey('WorkRequestDraft', related_name='related_work_requests', on_delete=CASCADE)
+    draft = ForeignKey('WorkRequestDraft', related_name='related_work_request_blueprint', on_delete=CASCADE)
 
 
 class WorkRequestRelationDraft(UserDefinedCommon):
@@ -244,12 +244,12 @@ class WorkRequestRelationDraft(UserDefinedCommon):
     draft = ForeignKey(WorkRelationSelectionTemplate, on_delete=CASCADE)
 
 
-class WorkRequestRelation(SystemDefinedCommon):
+class WorkRequestRelationBlueprint(SystemDefinedCommon):
     selection_doc = JSONField()
     dataformat = ForeignKey('DataformatChoice', null=False, on_delete=CASCADE)
-    producer = ForeignKey(WorkRequest, related_name='produced_by', on_delete=CASCADE)
-    consumer = ForeignKey(WorkRequest, related_name='consumed_by', on_delete=CASCADE)
-    input_role = ForeignKey(WorkIORole, related_name='inputs_work_request_relation', on_delete=CASCADE)
-    output_role = ForeignKey(WorkIORole, related_name='outputs_work_request_relation', on_delete=CASCADE)
+    producer = ForeignKey(WorkRequestBlueprint, related_name='produced_by', on_delete=CASCADE)
+    consumer = ForeignKey(WorkRequestBlueprint, related_name='consumed_by', on_delete=CASCADE)
+    input_role = ForeignKey(WorkIORole, related_name='inputs_work_request_relation_blueprint', on_delete=CASCADE)
+    output_role = ForeignKey(WorkIORole, related_name='outputs_work_request_relation_blueprint', on_delete=CASCADE)
     draft = ForeignKey(WorkRequestRelationDraft, on_delete=CASCADE)
 

SAS/LSMR/src/lsmr/lsmrapp/serializers/specification.py

@@ -114,9 +114,9 @@ class RunDraftSerializer(serializers.HyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class RunSerializer(serializers.HyperlinkedModelSerializer):
+class RunBlueprintSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
-        model = models.Run
+        model = models.RunBlueprint
         fields = '__all__'
 
 
@@ -126,9 +126,9 @@ class WorkRequestDraftSerializer(serializers.HyperlinkedModelSerializer):
         fields = '__all__'
 
 
-class WorkRequestSerializer(serializers.HyperlinkedModelSerializer):
+class WorkRequestBlueprintSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
-        model = models.WorkRequest
+        model = models.WorkRequestBlueprint
         fields = '__all__'
 
 
@@ -138,9 +138,9 @@ class WorkRequestRelationDraftSerializer(serializers.HyperlinkedModelSerializer)
         fields = '__all__'
 
 
-class WorkRequestRelationSerializer(serializers.HyperlinkedModelSerializer):
+class WorkRequestRelationBlueprintSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
-        model = models.WorkRequestRelation
+        model = models.WorkRequestRelationBlueprint
         fields = '__all__'
 
 

SAS/LSMR/src/lsmr/lsmrapp/viewsets/specification.py

@@ -96,9 +96,9 @@ class RunDraftViewSet(viewsets.ModelViewSet):
     serializer_class = serializers.RunDraftSerializer
 
 
-class RunViewSet(viewsets.ModelViewSet):
-    queryset = models.Run.objects.all()
-    serializer_class = serializers.RunSerializer
+class RunBlueprintViewSet(viewsets.ModelViewSet):
+    queryset = models.RunBlueprint.objects.all()
+    serializer_class = serializers.RunBlueprintSerializer
 
 
 class WorkRequestDraftViewSet(viewsets.ModelViewSet):
@@ -106,9 +106,9 @@ class WorkRequestDraftViewSet(viewsets.ModelViewSet):
     serializer_class = serializers.WorkRequestDraftSerializer
 
 
-class WorkRequestViewSet(viewsets.ModelViewSet):
-    queryset = models.WorkRequest.objects.all()
-    serializer_class = serializers.WorkRequestSerializer
+class WorkRequestBlueprintViewSet(viewsets.ModelViewSet):
+    queryset = models.WorkRequestBlueprint.objects.all()
+    serializer_class = serializers.WorkRequestBlueprintSerializer
 
 
 class WorkRequestRelationDraftViewSet(viewsets.ModelViewSet):
@@ -116,6 +116,6 @@ class WorkRequestRelationDraftViewSet(viewsets.ModelViewSet):
     serializer_class = serializers.WorkRequestRelationDraftSerializer
 
 
-class WorkRequestRelationViewSet(viewsets.ModelViewSet):
-    queryset = models.WorkRequestRelation.objects.all()
-    serializer_class = serializers.WorkRequestRelationSerializer
+class WorkRequestRelationBlueprintViewSet(viewsets.ModelViewSet):
+    queryset = models.WorkRequestRelationBlueprint.objects.all()
+    serializer_class = serializers.WorkRequestRelationBlueprintSerializer

SAS/LSMR/src/lsmr/urls.py

@@ -57,10 +57,12 @@ router.register(r'default_work_relation_selection_template', viewsets.DefaultWor
 router.register(r'cycle', viewsets.CycleViewSet)
 router.register(r'project', viewsets.ProjectViewSet)
 router.register(r'run_set', viewsets.RunSetViewSet)
+router.register(r'run_draft', viewsets.RunDraftViewSet)
+router.register(r'run_blueprint', viewsets.RunBlueprintViewSet)
 router.register(r'work_request_draft', viewsets.WorkRequestDraftViewSet)
-router.register(r'work_request', viewsets.WorkRequestViewSet)
+router.register(r'work_request_blueprint', viewsets.WorkRequestBlueprintViewSet)
 router.register(r'work_request_relation_draft', viewsets.WorkRequestRelationDraftViewSet)
-router.register(r'work_request_relation', viewsets.WorkRequestRelationViewSet)
+router.register(r'work_request_relation_blueprint', viewsets.WorkRequestRelationBlueprintViewSet)
 
 
 urlpatterns.extend(router.urls)