Collect final work on django implementation (#18)

this work  will be tagged and then deleted

Author: chrisbc

nshm/admin.py

@@ -6,8 +6,8 @@
     LocationList,
     SeismicHazardModel,
     SourceLogicTree,
-    SourceLogicTreeComponent,
-    SourceLogicTreeWeightedComponent,
+    SourceLogicTreeSource,
+    SourceLogicTreeBranch,
 )
 
 
@@ -24,7 +24,7 @@ class GMCMLogicTreeAdmin(admin.ModelAdmin):
     fields = ["version", "notes"]
 
 
-class SourceLogicTreeComponentAdmin(admin.ModelAdmin):
+class SourceLogicTreeSourceAdmin(admin.ModelAdmin):
     fields = [
         "tag",
         "notes",
@@ -37,7 +37,7 @@ class SourceLogicTreeComponentAdmin(admin.ModelAdmin):
     list_filter = ["tectonic_region", "group"]
 
 
-class SourceLogicTreeWeightedComponentAdmin(admin.ModelAdmin):
+class SourceLogicTreeBranchAdmin(admin.ModelAdmin):
     fields = ["weight", "source_logic_tree", "source_logic_tree_component"]
 
 
@@ -61,9 +61,9 @@ class HazardSolutionAdmin(admin.ModelAdmin):
 admin.site.register(SeismicHazardModel, SeismicHazardModelAdmin)
 admin.site.register(SourceLogicTree, SourceLogicTreeAdmin)
 admin.site.register(GMCMLogicTree, GMCMLogicTreeAdmin)
-admin.site.register(SourceLogicTreeComponent, SourceLogicTreeComponentAdmin)
+admin.site.register(SourceLogicTreeSource, SourceLogicTreeSourceAdmin)
 admin.site.register(
-    SourceLogicTreeWeightedComponent, SourceLogicTreeWeightedComponentAdmin
+    SourceLogicTreeBranch, SourceLogicTreeBranchAdmin
 )
 
 admin.site.register(LocationList, LocationListAdmin)

nshm/documents.py

@@ -70,12 +70,12 @@ class Django:
     })    
 
 @registry.register_document
-class SourceLogicTreeComponentDocument(DocumentWithNodeId):
+class SourceLogicTreeSourceDocument(DocumentWithNodeId):
     class Index:
         name = COMMON_INDEX
 
     class Django:
-        model = models.SourceLogicTreeComponent
+        model = models.SourceLogicTreeSource
         fields = [
             'tag', 
             'notes',
@@ -92,13 +92,13 @@ class Django:
 
 
 @registry.register_document
-class SourceLogicTreeWeightedComponentDocument(DocumentWithNodeId):
+class SourceLogicTreeBranchDocument(DocumentWithNodeId):
 
     class Index:
         name = COMMON_INDEX
 
     class Django:
-        model = models.SourceLogicTreeWeightedComponent
+        model = models.SourceLogicTreeBranch
         fields = [
             'weight',
         ]

nshm/migrations/0017_rename_sourcelogictreeweightedcomponent_sourcelogictreebranch_and_more.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.5 on 2023-11-05 21:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("nshm", "0016_remove_seismichazardmodel_typename"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="SourceLogicTreeWeightedComponent",
+            new_name="SourceLogicTreeBranch",
+        ),
+        migrations.RenameModel(
+            old_name="SourceLogicTreeComponent",
+            new_name="SourceLogicTreeSource",
+        ),
+    ]

nshm/models.py

@@ -20,7 +20,7 @@ def __str__(self):
         return self.version
 
 
-class SourceLogicTreeComponent(models.Model):
+class SourceLogicTreeSource(models.Model):
     tag = models.CharField(max_length=50)
     notes = models.TextField(null=True, blank=True)
     inversion_toshi_id = models.CharField(max_length=50, null=False)
@@ -34,7 +34,7 @@ def __str__(self):
         return f"{self.tag} {self.tectonic_region}"
 
 
-class SourceLogicTreeWeightedComponent(models.Model):
+class SourceLogicTreeBranch(models.Model):
     weight = models.FloatField()
     source_logic_tree = models.ForeignKey(
         SourceLogicTree,
@@ -43,7 +43,7 @@ class SourceLogicTreeWeightedComponent(models.Model):
         on_delete=models.CASCADE,
     )
     source_logic_tree_component = models.ForeignKey(
-        SourceLogicTreeComponent,
+        SourceLogicTreeSource,
         related_name="slt_weighted_components",
         null=True,
         on_delete=models.SET_NULL,
@@ -102,6 +102,6 @@ class HazardSolution(models.Model):
         LocationList, related_name="hazard_solutions"
     )
     slt_components = models.ManyToManyField(
-        SourceLogicTreeWeightedComponent, related_name="hazard_solutions"
+        SourceLogicTreeBranch, related_name="hazard_solutions"
     )
 

nshm/schema.py

@@ -28,9 +28,9 @@ class Meta:
         interfaces = (relay.Node,)
 
 
-class SourceLogicTreeComponent(DjangoObjectType):
+class SourceLogicTreeSource(DjangoObjectType):
     class Meta:
-        model = models.SourceLogicTreeComponent
+        model = models.SourceLogicTreeSource
         interfaces = (relay.Node,)
         filter_fields = [
             "tag",
@@ -41,9 +41,9 @@ class Meta:
         ]
 
 
-class SourceLogicTreeWeightedComponent(DjangoObjectType):
+class SourceLogicTreeBranch(DjangoObjectType):
     class Meta:
-        model = models.SourceLogicTreeWeightedComponent
+        model = models.SourceLogicTreeBranch
         interfaces = (relay.Node,)
 
 
@@ -66,12 +66,12 @@ class Query(ObjectType):
     source_logic_tree = relay.Node.Field(SourceLogicTree)
     all_source_logic_trees = DjangoFilterConnectionField(SourceLogicTree)
 
-    source_logic_tree_component = relay.Node.Field(SourceLogicTreeComponent)
+    source_logic_tree_component = relay.Node.Field(SourceLogicTreeSource)
     all_source_logic_tree_components = DjangoFilterConnectionField(
-        SourceLogicTreeComponent
+        SourceLogicTreeSource
     )
 
     gmcm_logic_tree = relay.Node.Field(GMCM_LogicTree)
     all_gmcm_logic_trees = DjangoFilterConnectionField(GMCM_LogicTree)
 
-    # source_logic_tree_weighted_component = relay.Node.Field(SourceLogicTreeWeightedComponent)
+    # source_logic_tree_weighted_component = relay.Node.Field(SourceLogicTreeBranch)

nzshm_model_graphql_api/settings.py

@@ -181,8 +181,8 @@
 # For example, my-test-domain.us-east-1.es.amazonaws.com
 # ES_HOST = 'https://search-nshm-model-opensearch-poc-fz3qmvqjus5clpyxgvfju3c4fq.ap-southeast-2.es.amazonaws.com' # OpenSearch
 # ES_HOST = 'https://search-nshm-model-opensearch-es-fayxiqeijwlgiuo6gdv6cjf7vy.ap-southeast-2.es.amazonaws.com' # Elastic 7.10
-# ES_HOST = 'https://search-nzshm22-toshi-api-es-test-ybx3zlp6hz2shrytj2ns4zx6bm.ap-southeast-2.es.amazonaws.com' # TOSHI_TEST
-ES_HOST = "https://search-nzshm22-toshi-api-es-prod-cj4taqcgnefophpxzan55xeswa.ap-southeast-2.es.amazonaws.com" # TOSHI_PROD
+ES_HOST = 'https://search-nzshm22-toshi-api-es-test-ybx3zlp6hz2shrytj2ns4zx6bm.ap-southeast-2.es.amazonaws.com' # TOSHI_TEST
+# ES_HOST = "https://search-nzshm22-toshi-api-es-prod-cj4taqcgnefophpxzan55xeswa.ap-southeast-2.es.amazonaws.com" # TOSHI_PROD
 
 ES_REGION = 'ap-southeast-2' # e.g. us-west-1
 IS_OFFLINE = None