diff --git a/api-rework/client/src/activities/subtypes/TerrestrialObservation.tsx b/api-rework/client/src/activities/subtypes/TerrestrialObservation.tsx index 15a48f4c8..ba109f032 100644 --- a/api-rework/client/src/activities/subtypes/TerrestrialObservation.tsx +++ b/api-rework/client/src/activities/subtypes/TerrestrialObservation.tsx @@ -3,7 +3,6 @@ import TextInput from 'common-components/inputs/TextInput'; import { SubtypeData } from 'constants'; const TerrestrialObservation = ({ subtypeData }: SubtypeData) => { - console.log(subtypeData); return ( <>
diff --git a/api-rework/invasives/api/fixtures/test/common/test_nearest_wells.json b/api-rework/invasives/api/fixtures/test/common/test_nearest_wells.json index dd0b80cd4..e592d507a 100644 --- a/api-rework/invasives/api/fixtures/test/common/test_nearest_wells.json +++ b/api-rework/invasives/api/fixtures/test/common/test_nearest_wells.json @@ -1,6 +1,6 @@ [ { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -9,7 +9,7 @@ } }, { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 2, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -18,7 +18,7 @@ } }, { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 3, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -27,7 +27,7 @@ } }, { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 4, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -36,7 +36,7 @@ } }, { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 5, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -45,7 +45,7 @@ } }, { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 6, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_collection.json b/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_collection.json index cd971fad4..b081cfcfd 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_collection.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_collection.json @@ -119,7 +119,7 @@ } }, { - "model": "api.TerrestrialBiocontrolCollectionInformation", + "model": "api.TerrestrialBiocontrolCollectionEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -135,7 +135,7 @@ } }, { - "model": "api.TerrestrialBiocontrolCollectionInformation", + "model": "api.TerrestrialBiocontrolCollectionEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -151,7 +151,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountSimple", + "model": "api.TerrestrialBiocontrolAgentCount", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -163,7 +163,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountSimple", + "model": "api.TerrestrialBiocontrolAgentCount", "pk": 2, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_dispersal_monitoring.json b/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_dispersal_monitoring.json index 38f515610..e1efd0b9e 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_dispersal_monitoring.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/biocontrol/test_biocontrol_dispersal_monitoring.json @@ -119,7 +119,7 @@ } }, { - "model": "api.TerrestrialBiocontrolDispersalMonitoring", + "model": "api.TerrestrialBiocontrolDispersalMonitoringEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -138,7 +138,7 @@ } }, { - "model": "api.TerrestrialBiocontrolDispersalMonitoring", + "model": "api.TerrestrialBiocontrolDispersalMonitoringEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -157,7 +157,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountComplex", + "model": "api.TerrestrialBiocontrolAgentCountExtended", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -171,7 +171,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountComplex", + "model": "api.TerrestrialBiocontrolAgentCountExtended", "pk": 2, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_biocontrol_release_monitoring.json b/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_biocontrol_release_monitoring.json index ebde03844..2e28693de 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_biocontrol_release_monitoring.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_biocontrol_release_monitoring.json @@ -118,7 +118,7 @@ } }, { - "model": "api.TerrestrialBiocontrolDispersalMonitoring", + "model": "api.TerrestrialBiocontrolDispersalMonitoringEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -136,7 +136,7 @@ } }, { - "model": "api.TerrestrialBiocontrolDispersalMonitoring", + "model": "api.TerrestrialBiocontrolDispersalMonitoringEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -154,7 +154,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountComplex", + "model": "api.TerrestrialBiocontrolAgentCountExtended", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -168,7 +168,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountComplex", + "model": "api.TerrestrialBiocontrolAgentCountExtended", "pk": 2, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_chemical_treatment_monitoring.json b/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_chemical_treatment_monitoring.json index b00f29d9f..ba663b83c 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_chemical_treatment_monitoring.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_chemical_treatment_monitoring.json @@ -39,7 +39,7 @@ } }, { - "model": "api.TerrestrialTreatmentMonitoringInformation", + "model": "api.TerrestrialTreatmentMonitoringEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -51,7 +51,7 @@ } }, { - "model": "api.TerrestrialTreatmentMonitoringInformation", + "model": "api.TerrestrialTreatmentMonitoringEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -63,7 +63,7 @@ } }, { - "model": "api.AquaticTreatmentMonitoringInformation", + "model": "api.AquaticTreatmentMonitoringEntry", "pk": 1, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -94,7 +94,7 @@ } }, { - "model": "api.NearestWell", + "model": "api.WellEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_mechanical_treatment_monitoring.json b/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_mechanical_treatment_monitoring.json index 111ea1b65..9050398b2 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_mechanical_treatment_monitoring.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/monitoring/test_mechanical_treatment_monitoring.json @@ -38,7 +38,7 @@ } }, { - "model": "api.TerrestrialTreatmentMonitoringInformation", + "model": "api.TerrestrialTreatmentMonitoringEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -50,7 +50,7 @@ } }, { - "model": "api.TerrestrialTreatmentMonitoringInformation", + "model": "api.TerrestrialTreatmentMonitoringEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -61,7 +61,7 @@ } }, { - "model": "api.AquaticTreatmentMonitoringInformation", + "model": "api.AquaticTreatmentMonitoringEntry", "pk": 1, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/observations/test_aquatic_observation.json b/api-rework/invasives/api/fixtures/test/subtypes/observations/test_aquatic_observation.json index 8dfd98cda..3baa11c73 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/observations/test_aquatic_observation.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/observations/test_aquatic_observation.json @@ -54,7 +54,7 @@ } }, { - "model": "api.AquaticPlantObservationDetail", + "model": "api.AquaticPlantObservationEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -67,7 +67,7 @@ } }, { - "model": "api.AquaticPlantObservationDetail", + "model": "api.AquaticPlantObservationEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -80,7 +80,7 @@ } }, { - "model": "api.AquaticPlantObservationDetail", + "model": "api.AquaticPlantObservationEntry", "pk": 3, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -263,7 +263,7 @@ } }, { - "model": "api.WaterbodyData", + "model": "api.WaterbodyContext", "pk": 1, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -279,7 +279,7 @@ } }, { - "model": "api.WaterbodyData", + "model": "api.WaterbodyContext", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -295,7 +295,7 @@ } }, { - "model": "api.WaterbodyData", + "model": "api.WaterbodyContext", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/observations/test_terrestrial_observation.json b/api-rework/invasives/api/fixtures/test/subtypes/observations/test_terrestrial_observation.json index 478eaecc2..0d0cfdad1 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/observations/test_terrestrial_observation.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/observations/test_terrestrial_observation.json @@ -55,7 +55,7 @@ } }, { - "model": "api.TerrestrialPlantObservationDetail", + "model": "api.TerrestrialPlantObservationEntries", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -67,7 +67,7 @@ } }, { - "model": "api.TerrestrialPlantObservationDetail", + "model": "api.TerrestrialPlantObservationEntries", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -79,7 +79,7 @@ } }, { - "model": "api.TerrestrialPlantObservationDetail", + "model": "api.TerrestrialPlantObservationEntries", "pk": 3, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -88,7 +88,7 @@ } }, { - "model": "api.TerrestrialPlantObservationInfo", + "model": "api.TerrestrialPlantObservationContext", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -102,7 +102,7 @@ } }, { - "model": "api.TerrestrialPlantObservationInfo", + "model": "api.TerrestrialPlantObservationContext", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_chemical_treatment.json b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_chemical_treatment.json index 01cbd70cd..3b4451306 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_chemical_treatment.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_chemical_treatment.json @@ -39,7 +39,7 @@ } }, { - "model": "api.ChemTreatment", + "model": "api.ChemTreatmentContext", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -60,7 +60,7 @@ } }, { - "model": "api.ChemTreatment", + "model": "api.ChemTreatmentContext", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_mechanical_treatment.json b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_mechanical_treatment.json index 2815e5164..ccb48f078 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_mechanical_treatment.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_aquatic_mechanical_treatment.json @@ -39,7 +39,7 @@ } }, { - "model": "api.AquaticPlantMechanicalTreatment", + "model": "api.AquaticPlantMechanicalTreatmentEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -52,7 +52,7 @@ } }, { - "model": "api.AquaticPlantMechanicalTreatment", + "model": "api.AquaticPlantMechanicalTreatmentEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -65,7 +65,7 @@ } }, { - "model": "api.AquaticPlantMechanicalTreatment", + "model": "api.AquaticPlantMechanicalTreatmentEntry", "pk": 3, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_biocontrol_release.json b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_biocontrol_release.json index 13ccba308..07522cce9 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_biocontrol_release.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_biocontrol_release.json @@ -119,7 +119,7 @@ } }, { - "model": "api.TerrestrialBiocontrolRelease", + "model": "api.TerrestrialBiocontrolReleaseEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -134,7 +134,7 @@ } }, { - "model": "api.TerrestrialBiocontrolRelease", + "model": "api.TerrestrialBiocontrolReleaseEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -149,7 +149,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountSimple", + "model": "api.TerrestrialBiocontrolAgentCount", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -161,7 +161,7 @@ } }, { - "model": "api.TerrestrialBiocontrolAgentCountSimple", + "model": "api.TerrestrialBiocontrolAgentCount", "pk": 2, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_chemical_treatment.json b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_chemical_treatment.json index 6a06f5e1f..d36dc023e 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_chemical_treatment.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_chemical_treatment.json @@ -39,7 +39,7 @@ } }, { - "model": "api.ChemTreatment", + "model": "api.ChemTreatmentContext", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -60,7 +60,7 @@ } }, { - "model": "api.ChemTreatment", + "model": "api.ChemTreatmentContext", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_mechanical_treatment.json b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_mechanical_treatment.json index fe36a2683..45ee151e6 100644 --- a/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_mechanical_treatment.json +++ b/api-rework/invasives/api/fixtures/test/subtypes/treatments/test_terrestrial_mechanical_treatment.json @@ -39,7 +39,7 @@ } }, { - "model": "api.TerrestrialPlantMechanicalTreatment", + "model": "api.TerrestrialPlantMechanicalTreatmentEntry", "pk": 1, "fields": { "activity_id": "6BBA2749-EE3D-41B6-A9F1-4A0CB37029F7", @@ -52,7 +52,7 @@ } }, { - "model": "api.TerrestrialPlantMechanicalTreatment", + "model": "api.TerrestrialPlantMechanicalTreatmentEntry", "pk": 2, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", @@ -65,7 +65,7 @@ } }, { - "model": "api.TerrestrialPlantMechanicalTreatment", + "model": "api.TerrestrialPlantMechanicalTreatmentEntry", "pk": 3, "fields": { "activity_id": "CD542709-F767-402F-818E-117B3FBC797D", diff --git a/api-rework/invasives/api/legacy_db/mappings/plants.py b/api-rework/invasives/api/legacy_db/mappings/plants.py index 085402037..cac411491 100644 --- a/api-rework/invasives/api/legacy_db/mappings/plants.py +++ b/api-rework/invasives/api/legacy_db/mappings/plants.py @@ -7,8 +7,8 @@ Activity, Participant, PretreatmentObservation, - TerrestrialPlantObservationDetail, - TerrestrialPlantObservationInfo, + TerrestrialPlantObservationEntries, + TerrestrialPlantObservationContext, TerrestrialVoucherSpecimen, ) from api.models.codes import ( @@ -75,7 +75,7 @@ def add_terrestrial_plant_observation_information(new: Activity, old: LegacyActi old.activity_payload.form_data.activity_subtype_data.Observation_PlantTerrestrial_Information ) - TerrestrialPlantObservationInfo.objects.create( + TerrestrialPlantObservationContext.objects.create( activity=new, research_observation=old_information.research_detection_ind, aspect=( @@ -118,7 +118,7 @@ def add_subtype_payload_for_plant_terrestrial_observation( ) for plant in old.activity_payload.form_data.activity_subtype_data.TerrestrialPlants: - TerrestrialPlantObservationDetail.objects.create( + TerrestrialPlantObservationEntries.objects.create( activity=new, observation_type=( ObservationType.Positive.value diff --git a/api-rework/invasives/api/legacy_db/mappings/wells.py b/api-rework/invasives/api/legacy_db/mappings/wells.py index 0d1cea5a5..cd6ae4756 100644 --- a/api-rework/invasives/api/legacy_db/mappings/wells.py +++ b/api-rework/invasives/api/legacy_db/mappings/wells.py @@ -1,7 +1,7 @@ import logging from api.legacy_db.model_serializer import LegacyActivity -from api.models.activity import Activity, NearestWell +from api.models.activity import Activity, WellEntry def add_well_information(new: Activity, old: LegacyActivity): @@ -14,7 +14,7 @@ def add_well_information(new: Activity, old: LegacyActivity): "Omitting empty well spec because of magic string well id = 'No wells found'" ) else: - NearestWell.objects.create( + WellEntry.objects.create( activity=new, well_tag_number=well.well_id, distance=well.well_proximity, diff --git a/api-rework/invasives/api/migrations/0002_initial.py b/api-rework/invasives/api/migrations/0002_initial.py index 8b57def9b..5356e4ca8 100644 --- a/api-rework/invasives/api/migrations/0002_initial.py +++ b/api-rework/invasives/api/migrations/0002_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 6.0 on 2026-01-26 06:10 +# Generated by Django 6.0 on 2026-02-03 19:30 import api.models.enums.water_level_management import django.core.validators @@ -950,7 +950,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."aquatic_mechanical_authorization"', + "db_table": '"activity"."mechanical_authorization_pa"', }, ), migrations.CreateModel( @@ -990,7 +990,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."aquatic_voucher_specimen"', + "db_table": '"activity"."voucher_specimen_pa"', }, ), migrations.CreateModel( @@ -1089,7 +1089,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."aquatic_plant_on_site"', + "db_table": '"activity"."plant_on_site_pa"', "abstract": False, }, ), @@ -1151,41 +1151,6 @@ class Migration(migrations.Migration): "db_table": '"etl"."activity_migration_error"', }, ), - migrations.CreateModel( - name="NearestWell", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ( - "well_tag_number", - models.PositiveIntegerField( - db_comment="Identifier of a Registered Well" - ), - ), - ( - "distance", - models.PositiveIntegerField( - db_comment="Distance from centroid of activity" - ), - ), - ( - "activity", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="api.activity" - ), - ), - ], - options={ - "db_table": '"activity"."nearest_well"', - }, - ), migrations.CreateModel( name="Participant", fields=[ @@ -1222,7 +1187,7 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name="AquaticPlantObservationDetail", + name="AquaticPlantObservationEntry", fields=[ ( "id", @@ -1288,11 +1253,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."aquatic_plant_observation_detail"', + "db_table": '"activity"."observation_context_pa"', }, ), migrations.CreateModel( - name="AquaticPlantMechanicalTreatment", + name="AquaticPlantMechanicalTreatmentEntry", fields=[ ( "id", @@ -1349,7 +1314,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."aquatic_plant_mechanical_treatment"', + "db_table": '"activity"."treatment_mechanical_entries_pa"', }, ), migrations.CreateModel( @@ -1378,7 +1343,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."pre_treatment_observation"', + "db_table": '"activity"."observation_pre_treatment_p"', "db_table_comment": "Detail that an Observation has taken place before any known Treatments have occured", }, ), @@ -1433,7 +1398,7 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name="ChemTreatment", + name="ChemTreatmentContext", fields=[ ( "id", @@ -1537,7 +1502,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."chem_treatment"', + "db_table": '"activity"."treatment_chemical_context_p"', }, ), migrations.CreateModel( @@ -1794,12 +1759,12 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_plant_on_site"', + "db_table": '"activity"."plant_on_site_pt"', "abstract": False, }, ), migrations.CreateModel( - name="TerrestrialBiocontrolRelease", + name="TerrestrialBiocontrolReleaseEntry", fields=[ ( "id", @@ -1855,11 +1820,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_biocontrol_release"', + "db_table": '"activity"."biocontrol_release_pt"', }, ), migrations.CreateModel( - name="TerrestrialBiocontrolDispersalMonitoring", + name="TerrestrialBiocontrolDispersalMonitoringEntry", fields=[ ( "id", @@ -1875,7 +1840,7 @@ class Migration(migrations.Migration): "monitoring_type", models.CharField(choices=[("Timed", "Timed"), ("Count", "Count")]), ), - ("plant_count", models.PositiveIntegerField()), + ("plant_count", models.PositiveIntegerField(blank=True, null=True)), ( "count_duration_minutes", models.SmallIntegerField(blank=True, null=True), @@ -1929,11 +1894,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_biocontrol_dispersal_monitoring"', + "db_table": '"activity"."monitoring_biocontrol_dispersal_entries_pt"', }, ), migrations.CreateModel( - name="TerrestrialBiocontrolCollectionInformation", + name="TerrestrialBiocontrolCollectionEntry", fields=[ ( "id", @@ -1996,11 +1961,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_biocontrol_collection_information"', + "db_table": '"activity"."biocontrol_collection_entries_pt"', }, ), migrations.CreateModel( - name="TerrestrialBiocontrolAgentCountSimple", + name="TerrestrialBiocontrolAgentCountExtended", fields=[ ( "id", @@ -2024,6 +1989,13 @@ class Migration(migrations.Migration): on_delete=django.db.models.deletion.CASCADE, to="api.activity" ), ), + ( + "agent_location", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to="api.agentlocationfoundcode", + ), + ), ( "biocontrol_agent", models.ForeignKey( @@ -2031,6 +2003,13 @@ class Migration(migrations.Migration): to="api.biocontrolagentcode", ), ), + ( + "plant_position", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to="api.plantpositioncode", + ), + ), ( "stage", models.ForeignKey( @@ -2047,11 +2026,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_biocontrol_agent_count_simple"', + "db_table": '"activity"."biocontrol_agent_count_extended_pt"', }, ), migrations.CreateModel( - name="TerrestrialBiocontrolAgentCountComplex", + name="TerrestrialBiocontrolAgentCount", fields=[ ( "id", @@ -2075,13 +2054,6 @@ class Migration(migrations.Migration): on_delete=django.db.models.deletion.CASCADE, to="api.activity" ), ), - ( - "agent_location", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - to="api.agentlocationfoundcode", - ), - ), ( "biocontrol_agent", models.ForeignKey( @@ -2089,13 +2061,6 @@ class Migration(migrations.Migration): to="api.biocontrolagentcode", ), ), - ( - "plant_position", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - to="api.plantpositioncode", - ), - ), ( "stage", models.ForeignKey( @@ -2112,7 +2077,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_biocontrol_agent_count_complex"', + "db_table": '"activity"."biocontrol_agent_count_pt"', }, ), migrations.CreateModel( @@ -2156,7 +2121,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."sign_of_biocontrol_presence_terrestrial"', + "db_table": '"activity"."sign_of_bioagent_presence_pt"', }, ), migrations.CreateModel( @@ -2200,11 +2165,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."location_biocontrol_agents_found_terrestrial"', + "db_table": '"activity"."bioagent_location_found_pt"', }, ), migrations.CreateModel( - name="TerrestrialPlantMechanicalTreatment", + name="TerrestrialPlantMechanicalTreatmentEntry", fields=[ ( "id", @@ -2261,11 +2226,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_plant_mechanical_treatment"', + "db_table": '"activity"."treatment_mechanical_entries_pt"', }, ), migrations.CreateModel( - name="TerrestrialPlantObservationDetail", + name="TerrestrialPlantObservationContext", fields=[ ( "id", @@ -2277,62 +2242,69 @@ class Migration(migrations.Migration): ), ), ( - "observation_type", + "suitable_for_biocontrol_agent", models.CharField( - choices=[ - ("Positive", "Positive Observation"), - ("Negative", "Negative Observation"), - ], - db_comment="The invasive plant in this record was [not] seen at the site.", + choices=[("Y", "Yes"), ("N", "No"), ("U", "Unknown")], + default="Unknown", + ), + ), + ( + "research_observation", + models.CharField( + choices=[("Y", "Yes"), ("N", "No"), ("U", "Unknown")], + default="Unknown", + ), + ), + ( + "visible_well_nearby", + models.CharField( + choices=[("Y", "Yes"), ("N", "No"), ("U", "Unknown")], + default="Unknown", ), ), ( "activity", - models.ForeignKey( + models.OneToOneField( on_delete=django.db.models.deletion.CASCADE, to="api.activity" ), ), ( - "density", + "aspect", models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.PROTECT, - to="api.densitycode", + on_delete=django.db.models.deletion.PROTECT, to="api.aspectcode" ), ), ( - "distribution", + "slope_percent", models.ForeignKey( - blank=True, - null=True, on_delete=django.db.models.deletion.PROTECT, - to="api.distributioncode", + to="api.slopepercentcode", ), ), ( - "invasive_plant", + "soil_texture", models.ForeignKey( + null=True, on_delete=django.db.models.deletion.PROTECT, - to="api.terrestrialplantcode", + to="api.soiltexturecode", ), ), ( - "life_stage", + "specific_use", models.ForeignKey( - blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, - to="api.plantlifestagecode", + to="api.specificusecode", ), ), ], options={ - "db_table": '"activity"."terrestrial_plant_observation_detail"', + "db_table": '"activity"."observation_context_pt"', + "db_table_comment": "Details of surrounding area for a terrestrial activity.", }, ), migrations.CreateModel( - name="TerrestrialPlantObservationInfo", + name="TerrestrialPlantObservationEntries", fields=[ ( "id", @@ -2344,65 +2316,58 @@ class Migration(migrations.Migration): ), ), ( - "suitable_for_biocontrol_agent", - models.CharField( - choices=[("Y", "Yes"), ("N", "No"), ("U", "Unknown")], - default="Unknown", - ), - ), - ( - "research_observation", - models.CharField( - choices=[("Y", "Yes"), ("N", "No"), ("U", "Unknown")], - default="Unknown", - ), - ), - ( - "visible_well_nearby", + "observation_type", models.CharField( - choices=[("Y", "Yes"), ("N", "No"), ("U", "Unknown")], - default="Unknown", + choices=[ + ("Positive", "Positive Observation"), + ("Negative", "Negative Observation"), + ], + db_comment="The invasive plant in this record was [not] seen at the site.", ), ), ( "activity", - models.OneToOneField( + models.ForeignKey( on_delete=django.db.models.deletion.CASCADE, to="api.activity" ), ), ( - "aspect", + "density", models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="api.aspectcode" + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="api.densitycode", ), ), ( - "slope_percent", + "distribution", models.ForeignKey( + blank=True, + null=True, on_delete=django.db.models.deletion.PROTECT, - to="api.slopepercentcode", + to="api.distributioncode", ), ), ( - "soil_texture", + "invasive_plant", models.ForeignKey( - null=True, on_delete=django.db.models.deletion.PROTECT, - to="api.soiltexturecode", + to="api.terrestrialplantcode", ), ), ( - "specific_use", + "life_stage", models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, - to="api.specificusecode", + to="api.plantlifestagecode", ), ), ], options={ - "db_table": '"activity"."terrestrial_plant_observation_info"', - "db_table_comment": "Details of surrounding area for a terrestrial activity.", + "db_table": '"activity"."observation_entries_pt"', }, ), migrations.CreateModel( @@ -2442,11 +2407,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_voucher_specimen"', + "db_table": '"activity"."voucher_specimen_pt"', }, ), migrations.CreateModel( - name="TerrestrialTreatmentMonitoringInformation", + name="TerrestrialTreatmentMonitoringEntry", fields=[ ( "id", @@ -2505,11 +2470,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."terrestrial_treatment_monitoring_info"', + "db_table": '"activity"."monitoring_treatment_entries_pt"', }, ), migrations.CreateModel( - name="AquaticTreatmentMonitoringInformation", + name="AquaticTreatmentMonitoringEntry", fields=[ ( "id", @@ -2568,7 +2533,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."aquatic_treatment_monitoring_info"', + "db_table": '"activity"."monitoring_treatment_entries_pa"', }, ), migrations.CreateModel( @@ -2636,11 +2601,11 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_adjacent_land_use"', + "db_table": '"activity"."water_adjacent_land_use"', }, ), migrations.CreateModel( - name="WaterbodyData", + name="WaterbodyContext", fields=[ ( "id", @@ -2689,7 +2654,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_data"', + "db_table": '"activity"."waterbody_context"', }, ), migrations.CreateModel( @@ -2719,7 +2684,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_inflow_permanent"', + "db_table": '"activity"."water_inflow_p"', }, ), migrations.CreateModel( @@ -2749,7 +2714,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_inflow_seasonal"', + "db_table": '"activity"."water_inflow_s"', }, ), migrations.CreateModel( @@ -2808,7 +2773,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_outflow_permanent"', + "db_table": '"activity"."water_outflow_p"', }, ), migrations.CreateModel( @@ -2838,7 +2803,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_outflow_seasonal"', + "db_table": '"activity"."water_outflow_s"', }, ), migrations.CreateModel( @@ -2868,7 +2833,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_substrate_level"', + "db_table": '"activity"."water_substrate_level"', }, ), migrations.CreateModel( @@ -2898,7 +2863,7 @@ class Migration(migrations.Migration): ), ], options={ - "db_table": '"activity"."waterbody_use"', + "db_table": '"activity"."water_use"', }, ), migrations.CreateModel( @@ -2957,6 +2922,41 @@ class Migration(migrations.Migration): "db_table": '"activity"."weather_conditions"', }, ), + migrations.CreateModel( + name="WellEntry", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ( + "well_tag_number", + models.PositiveIntegerField( + db_comment="Identifier of a Registered Well" + ), + ), + ( + "distance", + models.PositiveIntegerField( + db_comment="Distance from centroid of activity" + ), + ), + ( + "activity", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="api.activity" + ), + ), + ], + options={ + "db_table": '"activity"."well_entries"', + }, + ), migrations.AddIndex( model_name="activity", index=models.Index( @@ -2995,13 +2995,7 @@ class Migration(migrations.Migration): ), ), migrations.AddConstraint( - model_name="nearestwell", - constraint=models.UniqueConstraint( - fields=("activity", "well_tag_number"), name="unique_well_in_activity" - ), - ), - migrations.AddConstraint( - model_name="aquaticplantobservationdetail", + model_name="aquaticplantobservationentry", constraint=models.UniqueConstraint( fields=("activity", "invasive_plant"), name="aquaticplant_observation_detail_unique_plant", @@ -3034,14 +3028,14 @@ class Migration(migrations.Migration): ), ), migrations.AddConstraint( - model_name="terrestrialbiocontrolrelease", + model_name="terrestrialbiocontrolreleaseentry", constraint=models.UniqueConstraint( fields=("activity", "invasive_plant", "biocontrol_agent"), name="unique_biocontrol_release", ), ), migrations.AddConstraint( - model_name="terrestrialbiocontroldispersalmonitoring", + model_name="terrestrialbiocontroldispersalmonitoringentry", constraint=models.UniqueConstraint( fields=("activity", "invasive_plant", "biocontrol_agent"), name="unique_dispersal_monitoring", @@ -3072,7 +3066,7 @@ class Migration(migrations.Migration): ), ), migrations.AddConstraint( - model_name="terrestrialplantobservationdetail", + model_name="terrestrialplantobservationentries", constraint=models.UniqueConstraint( fields=("activity", "invasive_plant"), name="terrestrialplant_observation_detail_unique_plant", @@ -3106,4 +3100,10 @@ class Migration(migrations.Migration): name="waterbody_use_activity_waterbody_use", ), ), + migrations.AddConstraint( + model_name="wellentry", + constraint=models.UniqueConstraint( + fields=("activity", "well_tag_number"), name="unique_well_in_activity" + ), + ), ] diff --git a/api-rework/invasives/api/migrations/0003_alter_terrestrialbiocontroldispersalmonitoring_plant_count.py b/api-rework/invasives/api/migrations/0003_alter_terrestrialbiocontroldispersalmonitoring_plant_count.py deleted file mode 100644 index fdf2379f8..000000000 --- a/api-rework/invasives/api/migrations/0003_alter_terrestrialbiocontroldispersalmonitoring_plant_count.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 6.0 on 2026-01-29 21:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("api", "0002_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="terrestrialbiocontroldispersalmonitoring", - name="plant_count", - field=models.PositiveIntegerField(blank=True, null=True), - ), - ] diff --git a/api-rework/invasives/api/models/activity/biocontrol/__init__.py b/api-rework/invasives/api/models/activity/biocontrol/__init__.py index 10d4a8d33..6b0d4fb06 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/__init__.py +++ b/api-rework/invasives/api/models/activity/biocontrol/__init__.py @@ -1,18 +1,18 @@ from .biocontrol_agent_count import ( - TerrestrialBiocontrolAgentCountComplex, - TerrestrialBiocontrolAgentCountSimple, + TerrestrialBiocontrolAgentCountExtended, + TerrestrialBiocontrolAgentCount, ) from .microsite_condition import MicrositeCondition from .spread_results import SpreadResults from .target_plant_heights import TargetPlantHeights from .target_plant_phenology import TargetPlantPhenology from .terrestrial_biocontrol_collection_information import ( - TerrestrialBiocontrolCollectionInformation, + TerrestrialBiocontrolCollectionEntry, ) from .terrestrial_biocontrol_dispersal_monitoring import ( - TerrestrialBiocontrolDispersalMonitoring, + TerrestrialBiocontrolDispersalMonitoringEntry, ) -from .terrestrial_biocontrol_release import TerrestrialBiocontrolRelease +from .terrestrial_biocontrol_release import TerrestrialBiocontrolReleaseEntry from .weather_condition import WeatherConditions from .location_agents_found import LocationBiocontrolAgentsFoundTerrestrial from .sign_of_biocontrol_presence import SignOfBiocontrolPresenceTerrestrial diff --git a/api-rework/invasives/api/models/activity/biocontrol/biocontrol_agent_count.py b/api-rework/invasives/api/models/activity/biocontrol/biocontrol_agent_count.py index 62d98c9d9..fdc30b4a0 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/biocontrol_agent_count.py +++ b/api-rework/invasives/api/models/activity/biocontrol/biocontrol_agent_count.py @@ -86,7 +86,7 @@ class Meta: #### -class TerrestrialBiocontrolAgentCountSimple(BiocontrolAgentCountSimple): +class TerrestrialBiocontrolAgentCount(BiocontrolAgentCountSimple): """ consumed by: - Biocontrol Collection @@ -96,11 +96,11 @@ class TerrestrialBiocontrolAgentCountSimple(BiocontrolAgentCountSimple): invasive_plant = models.ForeignKey(TerrestrialPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."terrestrial_biocontrol_agent_count_simple"' + db_table = '"activity"."biocontrol_agent_count_pt"' pass -class TerrestrialBiocontrolAgentCountComplex(BiocontrolAgentCountComplex): +class TerrestrialBiocontrolAgentCountExtended(BiocontrolAgentCountComplex): """ consumed by: - Biocontrol Dispersal Monitoring @@ -109,5 +109,5 @@ class TerrestrialBiocontrolAgentCountComplex(BiocontrolAgentCountComplex): invasive_plant = models.ForeignKey(TerrestrialPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."terrestrial_biocontrol_agent_count_complex"' + db_table = '"activity"."biocontrol_agent_count_extended_pt"' pass diff --git a/api-rework/invasives/api/models/activity/biocontrol/location_agents_found.py b/api-rework/invasives/api/models/activity/biocontrol/location_agents_found.py index ebc6e1cd6..c031b64be 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/location_agents_found.py +++ b/api-rework/invasives/api/models/activity/biocontrol/location_agents_found.py @@ -15,7 +15,7 @@ class LocationBiocontrolAgentsFoundTerrestrial(BaseOneToManyActivityTable): biocontrol_agent = models.ForeignKey(BiocontrolAgentCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."location_biocontrol_agents_found_terrestrial"' + db_table = '"activity"."bioagent_location_found_pt"' constraints = [ models.UniqueConstraint( fields=[ diff --git a/api-rework/invasives/api/models/activity/biocontrol/sign_of_biocontrol_presence.py b/api-rework/invasives/api/models/activity/biocontrol/sign_of_biocontrol_presence.py index e8707361b..c23e14bb2 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/sign_of_biocontrol_presence.py +++ b/api-rework/invasives/api/models/activity/biocontrol/sign_of_biocontrol_presence.py @@ -15,7 +15,7 @@ class SignOfBiocontrolPresenceTerrestrial(BaseOneToManyActivityTable): biocontrol_agent = models.ForeignKey(BiocontrolAgentCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."sign_of_biocontrol_presence_terrestrial"' + db_table = '"activity"."sign_of_bioagent_presence_pt"' constraints = [ models.UniqueConstraint( fields=[ diff --git a/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_collection_information.py b/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_collection_information.py index 0ea76718f..c9eadfe0d 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_collection_information.py +++ b/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_collection_information.py @@ -10,7 +10,7 @@ from api.models.enums.collection_type import CollectionType -class TerrestrialBiocontrolCollectionInformation(BaseOneToManyActivityTable): +class TerrestrialBiocontrolCollectionEntry(BaseOneToManyActivityTable): """ Biocontrol 1:M Collection Information for Activities Used in: @@ -34,7 +34,7 @@ class TerrestrialBiocontrolCollectionInformation(BaseOneToManyActivityTable): comment = models.TextField(max_length=512, blank=True, null=True) class Meta: - db_table = '"activity"."terrestrial_biocontrol_collection_information"' + db_table = '"activity"."biocontrol_collection_entries_pt"' pass def clean(self): diff --git a/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_dispersal_monitoring.py b/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_dispersal_monitoring.py index 4efb5d051..3e7d91bb2 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_dispersal_monitoring.py +++ b/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_dispersal_monitoring.py @@ -10,7 +10,7 @@ from api.models.enums import CollectionType, YesNoUnknown -class TerrestrialBiocontrolDispersalMonitoring(BaseOneToManyActivityTable): +class TerrestrialBiocontrolDispersalMonitoringEntry(BaseOneToManyActivityTable): """ Biocontrol 1:M Monitoring Information Used in: @@ -34,7 +34,7 @@ class TerrestrialBiocontrolDispersalMonitoring(BaseOneToManyActivityTable): suitable_for_collection = models.CharField(choices=YesNoUnknown) class Meta: - db_table = '"activity"."terrestrial_biocontrol_dispersal_monitoring"' + db_table = '"activity"."monitoring_biocontrol_dispersal_entries_pt"' constraints = [ models.UniqueConstraint( fields=["activity", "invasive_plant", "biocontrol_agent"], diff --git a/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_release.py b/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_release.py index a20e2ea5b..f97c88142 100644 --- a/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_release.py +++ b/api-rework/invasives/api/models/activity/biocontrol/terrestrial_biocontrol_release.py @@ -6,7 +6,7 @@ from api.models.enums.yes_no_unknown import YesNoUnknown -class TerrestrialBiocontrolRelease(BaseOneToManyActivityTable): +class TerrestrialBiocontrolReleaseEntry(BaseOneToManyActivityTable): """ 1:M Details for Biocontrol Releases consumed by: @@ -31,7 +31,7 @@ class TerrestrialBiocontrolRelease(BaseOneToManyActivityTable): ) class Meta: - db_table = '"activity"."terrestrial_biocontrol_release"' + db_table = '"activity"."biocontrol_release_pt"' constraints = [ models.UniqueConstraint( fields=["activity", "invasive_plant", "biocontrol_agent"], diff --git a/api-rework/invasives/api/models/activity/monitoring/__init__.py b/api-rework/invasives/api/models/activity/monitoring/__init__.py index 8052fb9ae..f68ff9c6b 100644 --- a/api-rework/invasives/api/models/activity/monitoring/__init__.py +++ b/api-rework/invasives/api/models/activity/monitoring/__init__.py @@ -1,6 +1,6 @@ from .plant_treatment_monitoring import ( - AquaticTreatmentMonitoringInformation, - TerrestrialTreatmentMonitoringInformation, + AquaticTreatmentMonitoringEntry, + TerrestrialTreatmentMonitoringEntry, ) from .invasive_plant_on_site import ( AquaticInvasivePlantOnSite, diff --git a/api-rework/invasives/api/models/activity/monitoring/invasive_plant_on_site.py b/api-rework/invasives/api/models/activity/monitoring/invasive_plant_on_site.py index ffdba0a95..11977ffb8 100644 --- a/api-rework/invasives/api/models/activity/monitoring/invasive_plant_on_site.py +++ b/api-rework/invasives/api/models/activity/monitoring/invasive_plant_on_site.py @@ -22,7 +22,7 @@ class TerrestrialInvasivePlantOnSite(BaseInvasivePlantsOnSite): invasive_plant = models.ForeignKey(TerrestrialPlantCode, on_delete=models.PROTECT) class Meta(BaseInvasivePlantsOnSite.Meta): - db_table = '"activity"."terrestrial_plant_on_site"' + db_table = '"activity"."plant_on_site_pt"' constraints = [ models.UniqueConstraint( fields=["activity", "invasive_plant", "invasive_plant_on_site"], @@ -35,7 +35,7 @@ class AquaticInvasivePlantOnSite(BaseInvasivePlantsOnSite): invasive_plant = models.ForeignKey(AquaticPlantCode, on_delete=models.PROTECT) class Meta(BaseInvasivePlantsOnSite.Meta): - db_table = '"activity"."aquatic_plant_on_site"' + db_table = '"activity"."plant_on_site_pa"' constraints = [ models.UniqueConstraint( fields=["activity", "invasive_plant", "invasive_plant_on_site"], diff --git a/api-rework/invasives/api/models/activity/monitoring/plant_treatment_monitoring.py b/api-rework/invasives/api/models/activity/monitoring/plant_treatment_monitoring.py index bdebb77d5..625442319 100644 --- a/api-rework/invasives/api/models/activity/monitoring/plant_treatment_monitoring.py +++ b/api-rework/invasives/api/models/activity/monitoring/plant_treatment_monitoring.py @@ -58,7 +58,7 @@ def clean(self): self.treatment_efficacy_rating = None -class TerrestrialTreatmentMonitoringInformation(PlantMonitoringBase): +class TerrestrialTreatmentMonitoringEntry(PlantMonitoringBase): """ Terrestrial Plant Specific Monitoring for Chemical / Mechanical treatments. """ @@ -66,10 +66,10 @@ class TerrestrialTreatmentMonitoringInformation(PlantMonitoringBase): invasive_plant = models.ForeignKey(TerrestrialPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."terrestrial_treatment_monitoring_info"' + db_table = '"activity"."monitoring_treatment_entries_pt"' -class AquaticTreatmentMonitoringInformation(PlantMonitoringBase): +class AquaticTreatmentMonitoringEntry(PlantMonitoringBase): """ Aquatic Plant Specific Monitoring for Chemical / Mechanical treatments. """ @@ -77,4 +77,4 @@ class AquaticTreatmentMonitoringInformation(PlantMonitoringBase): invasive_plant = models.ForeignKey(AquaticPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."aquatic_treatment_monitoring_info"' + db_table = '"activity"."monitoring_treatment_entries_pa"' diff --git a/api-rework/invasives/api/models/activity/observations/__init__.py b/api-rework/invasives/api/models/activity/observations/__init__.py index 21b502489..27dc8b8bb 100644 --- a/api-rework/invasives/api/models/activity/observations/__init__.py +++ b/api-rework/invasives/api/models/activity/observations/__init__.py @@ -1,4 +1,4 @@ -from .aquatic_plant_observation_detail import * +from .aquatic_plant_observation_entry import * from .pre_treatment_observation import * from .shoreline_types import * from .terrestrial_plant_observation_detail import * diff --git a/api-rework/invasives/api/models/activity/observations/aquatic_plant_observation_detail.py b/api-rework/invasives/api/models/activity/observations/aquatic_plant_observation_entry.py similarity index 94% rename from api-rework/invasives/api/models/activity/observations/aquatic_plant_observation_detail.py rename to api-rework/invasives/api/models/activity/observations/aquatic_plant_observation_entry.py index 7c1b3c280..ad9f5e5c3 100644 --- a/api-rework/invasives/api/models/activity/observations/aquatic_plant_observation_detail.py +++ b/api-rework/invasives/api/models/activity/observations/aquatic_plant_observation_entry.py @@ -10,7 +10,7 @@ from api.models.enums.observation_type import ObservationType -class AquaticPlantObservationDetail(BaseOneToManyActivityTable): +class AquaticPlantObservationEntry(BaseOneToManyActivityTable): invasive_plant = models.ForeignKey(AquaticPlantCode, on_delete=models.PROTECT) density = models.ForeignKey( DensityCode, on_delete=models.PROTECT, blank=True, null=True @@ -25,7 +25,7 @@ class AquaticPlantObservationDetail(BaseOneToManyActivityTable): sample_point_id = models.CharField(max_length=128, blank=True, null=True) class Meta: - db_table = '"activity"."aquatic_plant_observation_detail"' + db_table = '"activity"."observation_context_pa"' constraints = [ models.UniqueConstraint( fields=["activity", "invasive_plant"], diff --git a/api-rework/invasives/api/models/activity/observations/pre_treatment_observation.py b/api-rework/invasives/api/models/activity/observations/pre_treatment_observation.py index 6f3a35335..7aae38df7 100644 --- a/api-rework/invasives/api/models/activity/observations/pre_treatment_observation.py +++ b/api-rework/invasives/api/models/activity/observations/pre_treatment_observation.py @@ -13,7 +13,7 @@ class PretreatmentObservation(BaseOneToOneActivityTable): pre_treatment_observation = models.CharField(choices=YesNoUnknown) class Meta: - db_table = '"activity"."pre_treatment_observation"' + db_table = '"activity"."observation_pre_treatment_p"' db_table_comment = "Detail that an Observation has taken place before any known Treatments have occured" pass diff --git a/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_detail.py b/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_detail.py index 82a7359b7..b638b31b8 100644 --- a/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_detail.py +++ b/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_detail.py @@ -10,7 +10,7 @@ from api.models.enums.observation_type import ObservationType -class TerrestrialPlantObservationDetail(BaseOneToManyActivityTable): +class TerrestrialPlantObservationEntries(BaseOneToManyActivityTable): """ section title: Terrestrial Invasive Plants @@ -34,7 +34,7 @@ class TerrestrialPlantObservationDetail(BaseOneToManyActivityTable): ) class Meta: - db_table = '"activity"."terrestrial_plant_observation_detail"' + db_table = '"activity"."observation_entries_pt"' constraints = [ models.UniqueConstraint( fields=["activity", "invasive_plant"], diff --git a/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_info.py b/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_info.py index 4577ea30c..8e0ee22b6 100644 --- a/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_info.py +++ b/api-rework/invasives/api/models/activity/observations/terrestrial_plant_observation_info.py @@ -10,7 +10,7 @@ from api.models.enums.yes_no_unknown import YesNoUnknown -class TerrestrialPlantObservationInfo(BaseOneToOneActivityTable): +class TerrestrialPlantObservationContext(BaseOneToOneActivityTable): """ section title: Observation Plant Terrestrial Information @@ -34,7 +34,7 @@ class TerrestrialPlantObservationInfo(BaseOneToOneActivityTable): slope_percent = models.ForeignKey(SlopePercentCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."terrestrial_plant_observation_info"' + db_table = '"activity"."observation_context_pt"' db_table_comment = "Details of surrounding area for a terrestrial activity." def clean(self): diff --git a/api-rework/invasives/api/models/activity/observations/voucher_specimen.py b/api-rework/invasives/api/models/activity/observations/voucher_specimen.py index 9c7795c19..54f6a58f6 100644 --- a/api-rework/invasives/api/models/activity/observations/voucher_specimen.py +++ b/api-rework/invasives/api/models/activity/observations/voucher_specimen.py @@ -30,7 +30,7 @@ class TerrestrialVoucherSpecimen(VoucherSpecimen): invasive_plant = models.ForeignKey(TerrestrialPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."terrestrial_voucher_specimen"' + db_table = '"activity"."voucher_specimen_pt"' pass @@ -38,5 +38,5 @@ class AquaticVoucherSpecimen(VoucherSpecimen): invasive_plant = models.ForeignKey(AquaticPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."aquatic_voucher_specimen"' + db_table = '"activity"."voucher_specimen_pa"' pass diff --git a/api-rework/invasives/api/models/activity/observations/waterbody_data.py b/api-rework/invasives/api/models/activity/observations/waterbody_data.py index 78af17570..ba4004130 100644 --- a/api-rework/invasives/api/models/activity/observations/waterbody_data.py +++ b/api-rework/invasives/api/models/activity/observations/waterbody_data.py @@ -4,7 +4,7 @@ from api.models.enums.waterbody_type import WaterbodyType -class WaterbodyData(BaseOneToOneActivityTable): +class WaterbodyContext(BaseOneToOneActivityTable): type = models.TextField(choices=WaterbodyType) name_gazetted = models.CharField(max_length=256) name_local = models.CharField(max_length=256) @@ -16,5 +16,5 @@ class WaterbodyData(BaseOneToOneActivityTable): comment = models.TextField(max_length=512) class Meta: - db_table = '"activity"."waterbody_data"' + db_table = '"activity"."waterbody_context"' pass diff --git a/api-rework/invasives/api/models/activity/observations/waterbody_flow_detail.py b/api-rework/invasives/api/models/activity/observations/waterbody_flow_detail.py index c3ddbabcb..3a955979c 100644 --- a/api-rework/invasives/api/models/activity/observations/waterbody_flow_detail.py +++ b/api-rework/invasives/api/models/activity/observations/waterbody_flow_detail.py @@ -18,13 +18,13 @@ class Meta: class WaterbodyOutflowSeasonal(BaseWaterbodyFlow): class Meta: - db_table = '"activity"."waterbody_outflow_seasonal"' + db_table = '"activity"."water_outflow_s"' pass class WaterbodyOutflowPermanent(BaseWaterbodyFlow): class Meta: - db_table = '"activity"."waterbody_outflow_permanent"' + db_table = '"activity"."water_outflow_p"' pass @@ -32,11 +32,11 @@ class WaterbodyInflowSeasonal(BaseWaterbodyFlow): flow_code = models.ForeignKey(WaterbodyFlowSeasonalCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."waterbody_inflow_seasonal"' + db_table = '"activity"."water_inflow_s"' pass class WaterbodyInflowPermanent(BaseWaterbodyFlow): class Meta: - db_table = '"activity"."waterbody_inflow_permanent"' + db_table = '"activity"."water_inflow_p"' pass diff --git a/api-rework/invasives/api/models/activity/observations/waterbody_substrate_type.py b/api-rework/invasives/api/models/activity/observations/waterbody_substrate_type.py index c9a1ebcdd..a116cba51 100644 --- a/api-rework/invasives/api/models/activity/observations/waterbody_substrate_type.py +++ b/api-rework/invasives/api/models/activity/observations/waterbody_substrate_type.py @@ -7,7 +7,7 @@ class WaterbodySubstrateType(BaseOneToManyActivityTable): substrate_type = models.ForeignKey(SubstrateCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."waterbody_substrate_level"' + db_table = '"activity"."water_substrate_level"' constraints = [ models.UniqueConstraint( fields=["activity", "substrate_type"], diff --git a/api-rework/invasives/api/models/activity/observations/waterbody_use.py b/api-rework/invasives/api/models/activity/observations/waterbody_use.py index 498a5b2b5..b8fa334e9 100644 --- a/api-rework/invasives/api/models/activity/observations/waterbody_use.py +++ b/api-rework/invasives/api/models/activity/observations/waterbody_use.py @@ -7,7 +7,7 @@ class WaterbodyUse(BaseOneToManyActivityTable): waterbody_use = models.ForeignKey(WaterbodyUseCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."waterbody_use"' + db_table = '"activity"."water_use"' constraints = [ models.UniqueConstraint( fields=["activity", "waterbody_use"], @@ -22,7 +22,7 @@ class WaterbodyAdjacentLandUse(BaseOneToManyActivityTable): ) class Meta: - db_table = '"activity"."waterbody_adjacent_land_use"' + db_table = '"activity"."water_adjacent_land_use"' constraints = [ models.UniqueConstraint( fields=["activity", "waterbody_adjacent_land_use"], diff --git a/api-rework/invasives/api/models/activity/treatments/aquatic_mechanical_authorization.py b/api-rework/invasives/api/models/activity/treatments/aquatic_mechanical_authorization.py index 2fb240293..bec0ac67f 100644 --- a/api-rework/invasives/api/models/activity/treatments/aquatic_mechanical_authorization.py +++ b/api-rework/invasives/api/models/activity/treatments/aquatic_mechanical_authorization.py @@ -10,4 +10,4 @@ class AquaticMechanicalAuthorization(BaseOneToOneActivityTable): ) class Meta: - db_table = '"activity"."aquatic_mechanical_authorization"' + db_table = '"activity"."mechanical_authorization_pa"' diff --git a/api-rework/invasives/api/models/activity/treatments/chem_treatment.py b/api-rework/invasives/api/models/activity/treatments/chem_treatment.py index 92bb9ca39..ce6d2afc5 100644 --- a/api-rework/invasives/api/models/activity/treatments/chem_treatment.py +++ b/api-rework/invasives/api/models/activity/treatments/chem_treatment.py @@ -13,7 +13,7 @@ from api.models.enums.yes_no_unknown import YesNoUnknown -class ChemTreatment(BaseOneToOneActivityTable): +class ChemTreatmentContext(BaseOneToOneActivityTable): service_license_number = models.ForeignKey( ServiceLicenseNumberAndCompany, on_delete=models.PROTECT ) @@ -51,7 +51,7 @@ class ChemTreatment(BaseOneToOneActivityTable): pest_injury_threshold_determination_bool = models.BooleanField() class Meta: - db_table = '"activity"."chem_treatment"' + db_table = '"activity"."treatment_chemical_context_p"' pass def clean(self): diff --git a/api-rework/invasives/api/models/activity/treatments/nearest_wells.py b/api-rework/invasives/api/models/activity/treatments/nearest_wells.py index 59cb19050..d1fda1da8 100644 --- a/api-rework/invasives/api/models/activity/treatments/nearest_wells.py +++ b/api-rework/invasives/api/models/activity/treatments/nearest_wells.py @@ -3,7 +3,7 @@ from api.models.activity.abstract_sub_tables import BaseOneToManyActivityTable -class NearestWell(BaseOneToManyActivityTable): +class WellEntry(BaseOneToManyActivityTable): """ Identifier for Registered wells in proximity of a Chemical Treatment Site. Distance is based on the Centroid value of the Activity shape @@ -17,7 +17,7 @@ class NearestWell(BaseOneToManyActivityTable): ) class Meta: - db_table = '"activity"."nearest_well"' + db_table = '"activity"."well_entries"' constraints = [ models.UniqueConstraint( fields=["activity", "well_tag_number"], diff --git a/api-rework/invasives/api/models/activity/treatments/plant_mechanical_treatment.py b/api-rework/invasives/api/models/activity/treatments/plant_mechanical_treatment.py index 50dd9682d..3b867829c 100644 --- a/api-rework/invasives/api/models/activity/treatments/plant_mechanical_treatment.py +++ b/api-rework/invasives/api/models/activity/treatments/plant_mechanical_treatment.py @@ -11,7 +11,7 @@ from api.models.enums.plant_disposal_format import PlantDisposalFormat -class PlantMechanicalTreatment(BaseOneToManyActivityTable): +class PlantMechanicalTreatmentEntry(BaseOneToManyActivityTable): """ Abstract Model for PlantMechanicalTreatments """ @@ -35,7 +35,7 @@ class Meta: ] -class TerrestrialPlantMechanicalTreatment(PlantMechanicalTreatment): +class TerrestrialPlantMechanicalTreatmentEntry(PlantMechanicalTreatmentEntry): """ Mechanical Treatment Information for Terrestrial Plant activities """ @@ -43,10 +43,10 @@ class TerrestrialPlantMechanicalTreatment(PlantMechanicalTreatment): invasive_plant = models.ForeignKey(TerrestrialPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."terrestrial_plant_mechanical_treatment"' + db_table = '"activity"."treatment_mechanical_entries_pt"' -class AquaticPlantMechanicalTreatment(PlantMechanicalTreatment): +class AquaticPlantMechanicalTreatmentEntry(PlantMechanicalTreatmentEntry): """ Mechanical Treatment Information for Aquatic Plant activities """ @@ -54,4 +54,4 @@ class AquaticPlantMechanicalTreatment(PlantMechanicalTreatment): invasive_plant = models.ForeignKey(AquaticPlantCode, on_delete=models.PROTECT) class Meta: - db_table = '"activity"."aquatic_plant_mechanical_treatment"' + db_table = '"activity"."treatment_mechanical_entries_pa"' diff --git a/api-rework/invasives/api/serializers/common/__init__.py b/api-rework/invasives/api/serializers/common/__init__.py index 0f371ee78..6a9b8be0b 100644 --- a/api-rework/invasives/api/serializers/common/__init__.py +++ b/api-rework/invasives/api/serializers/common/__init__.py @@ -9,8 +9,8 @@ from .nearest_well import NearestWellSerializer from .plant_phenology import TargetPlantPhenologySerializer from .biocontrol_counts import ( - TerrestrialBiocontrolAgentCountComplexSerializer, - TerrestrialBiocontrolAgentCountSimpleSerializer, + TerrestrialBiocontrolAgentCountExtendedSerializer, + TerrestrialBiocontrolAgentCountSerializer, ) from .microsite_conditions import MicrositeConditionSerializer from .weather_conditions import WeatherConditionsSerializer diff --git a/api-rework/invasives/api/serializers/common/biocontrol_counts.py b/api-rework/invasives/api/serializers/common/biocontrol_counts.py index da1126357..ca9e5bbb9 100644 --- a/api-rework/invasives/api/serializers/common/biocontrol_counts.py +++ b/api-rework/invasives/api/serializers/common/biocontrol_counts.py @@ -1,13 +1,13 @@ from rest_framework import serializers from api.models.activity import ( - TerrestrialBiocontrolAgentCountComplex, - TerrestrialBiocontrolAgentCountSimple, + TerrestrialBiocontrolAgentCountExtended, + TerrestrialBiocontrolAgentCount, ) -class TerrestrialBiocontrolAgentCountComplexSerializer(serializers.ModelSerializer): +class TerrestrialBiocontrolAgentCountExtendedSerializer(serializers.ModelSerializer): class Meta: - model = TerrestrialBiocontrolAgentCountComplex + model = TerrestrialBiocontrolAgentCountExtended fields = ( "quantity", "stage", @@ -16,9 +16,9 @@ class Meta: ) -class TerrestrialBiocontrolAgentCountSimpleSerializer(serializers.ModelSerializer): +class TerrestrialBiocontrolAgentCountSerializer(serializers.ModelSerializer): class Meta: - model = TerrestrialBiocontrolAgentCountSimple + model = TerrestrialBiocontrolAgentCount fields = ( "quantity", "stage", diff --git a/api-rework/invasives/api/serializers/common/biocontrol_dispersal_monitoring_information.py b/api-rework/invasives/api/serializers/common/biocontrol_dispersal_monitoring_information.py index 5ff13c1dd..ab8ed97f9 100644 --- a/api-rework/invasives/api/serializers/common/biocontrol_dispersal_monitoring_information.py +++ b/api-rework/invasives/api/serializers/common/biocontrol_dispersal_monitoring_information.py @@ -1,11 +1,11 @@ from rest_framework import serializers -from api.serializers.common import TerrestrialBiocontrolAgentCountComplexSerializer +from api.serializers.common import TerrestrialBiocontrolAgentCountExtendedSerializer from api.models.activity import ( ActivitySubtypes, LocationBiocontrolAgentsFoundTerrestrial, - TerrestrialBiocontrolDispersalMonitoring, + TerrestrialBiocontrolDispersalMonitoringEntry, SignOfBiocontrolPresenceTerrestrial, - TerrestrialBiocontrolAgentCountComplex, + TerrestrialBiocontrolAgentCountExtended, ) @@ -37,7 +37,7 @@ class TerrestrialBiologicalMonitoringEntriesSerializer(serializers.ModelSerializ estimated_biological_agents = serializers.SerializerMethodField() class Meta: - model = TerrestrialBiocontrolDispersalMonitoring + model = TerrestrialBiocontrolDispersalMonitoringEntry fields = ( "biocontrol_agent", "biocontrol_present", @@ -58,22 +58,22 @@ class Meta: ) def get_actual_biological_agents(self, obj): - qs = TerrestrialBiocontrolAgentCountComplex.objects.filter( + qs = TerrestrialBiocontrolAgentCountExtended.objects.filter( activity=obj.activity, is_estimate=False, invasive_plant=obj.invasive_plant, biocontrol_agent=obj.biocontrol_agent, ) - return TerrestrialBiocontrolAgentCountComplexSerializer(qs, many=True).data + return TerrestrialBiocontrolAgentCountExtendedSerializer(qs, many=True).data def get_estimated_biological_agents(self, obj): - qs = TerrestrialBiocontrolAgentCountComplex.objects.filter( + qs = TerrestrialBiocontrolAgentCountExtended.objects.filter( activity=obj.activity, is_estimate=True, invasive_plant=obj.invasive_plant, biocontrol_agent=obj.biocontrol_agent, ) - return TerrestrialBiocontrolAgentCountComplexSerializer(qs, many=True).data + return TerrestrialBiocontrolAgentCountExtendedSerializer(qs, many=True).data def get_sign_of_biocontrol_presence(self, obj): sbpt = SignOfBiocontrolPresenceTerrestrial.objects.filter( diff --git a/api-rework/invasives/api/serializers/common/chemical_treatment_information.py b/api-rework/invasives/api/serializers/common/chemical_treatment_information.py index 66d274e48..c30e8e91f 100644 --- a/api-rework/invasives/api/serializers/common/chemical_treatment_information.py +++ b/api-rework/invasives/api/serializers/common/chemical_treatment_information.py @@ -1,10 +1,10 @@ from rest_framework import serializers -from api.models.activity import ChemTreatment +from api.models.activity import ChemTreatmentContext class ChemicalTreatmentContextSerializer(serializers.ModelSerializer): class Meta: - model = ChemTreatment + model = ChemTreatmentContext fields = ( "service_license_number", "pesticide_use_permit", diff --git a/api-rework/invasives/api/serializers/common/nearest_well.py b/api-rework/invasives/api/serializers/common/nearest_well.py index 5ae7bab72..3ac796fa6 100644 --- a/api-rework/invasives/api/serializers/common/nearest_well.py +++ b/api-rework/invasives/api/serializers/common/nearest_well.py @@ -1,8 +1,8 @@ from rest_framework import serializers -from api.models.activity import NearestWell +from api.models.activity import WellEntry class NearestWellSerializer(serializers.ModelSerializer): class Meta: - model = NearestWell + model = WellEntry fields = ("well_tag_number", "distance") diff --git a/api-rework/invasives/api/serializers/common/treatment_monitoring_information.py b/api-rework/invasives/api/serializers/common/treatment_monitoring_information.py index b997ab6ac..5019c7a19 100644 --- a/api-rework/invasives/api/serializers/common/treatment_monitoring_information.py +++ b/api-rework/invasives/api/serializers/common/treatment_monitoring_information.py @@ -1,7 +1,7 @@ from rest_framework import serializers from api.models.activity import ( - AquaticTreatmentMonitoringInformation, - TerrestrialTreatmentMonitoringInformation, + AquaticTreatmentMonitoringEntry, + TerrestrialTreatmentMonitoringEntry, AquaticInvasivePlantOnSite, TerrestrialInvasivePlantOnSite, ) @@ -51,7 +51,7 @@ class TerrestrialTreatmentMonitoringSerializer(BaseTreatmentMonitoringSerializer invasive_plants_on_site = serializers.SerializerMethodField() class Meta(BaseTreatmentMonitoringSerializer.Meta): - model = TerrestrialTreatmentMonitoringInformation + model = TerrestrialTreatmentMonitoringEntry def get_invasive_plants_on_site(self, obj): """Search for invasive plants on site matching the record""" @@ -76,7 +76,7 @@ class AquaticMechanicalMonitoringSerializer(BaseTreatmentMonitoringSerializer): invasive_plants_on_site = serializers.SerializerMethodField() class Meta(BaseTreatmentMonitoringSerializer.Meta): - model = AquaticTreatmentMonitoringInformation + model = AquaticTreatmentMonitoringEntry def get_invasive_plants_on_site(self, obj): """Search for invasive plants on site matching the record""" @@ -107,10 +107,10 @@ class TreatmentMonitoringEntriesSerializer(serializers.Serializer): """Shared Between Mechanical and Chemical Treatments""" a_monitoring_information = AquaticMechanicalMonitoringSerializer( - source="aquatictreatmentmonitoringinformation_set", many=True, required=False + source="aquatictreatmentmonitoringentry_set", many=True, required=False ) t_monitoring_information = TerrestrialTreatmentMonitoringSerializer( - source="terrestrialtreatmentmonitoringinformation_set", + source="terrestrialtreatmentmonitoringentry_set", many=True, required=False, ) diff --git a/api-rework/invasives/api/serializers/type/subtype/aquatic_chemical_treatment.py b/api-rework/invasives/api/serializers/type/subtype/aquatic_chemical_treatment.py index 91bc2e543..9a841a980 100644 --- a/api-rework/invasives/api/serializers/type/subtype/aquatic_chemical_treatment.py +++ b/api-rework/invasives/api/serializers/type/subtype/aquatic_chemical_treatment.py @@ -6,8 +6,8 @@ class AquaticChemicalTreatmentSerializer(serializers.Serializer): - context = ChemicalTreatmentContextSerializer(source="chemtreatment") - well_entries = NearestWellSerializer(source="nearestwell_set", many=True) + context = ChemicalTreatmentContextSerializer(source="chemtreatmentcontext") + well_entries = NearestWellSerializer(source="wellentry_set", many=True) entries = serializers.SerializerMethodField() def get_entries(self, obj): diff --git a/api-rework/invasives/api/serializers/type/subtype/aquatic_mechanical_treatment.py b/api-rework/invasives/api/serializers/type/subtype/aquatic_mechanical_treatment.py index a69de9f5f..807a85083 100644 --- a/api-rework/invasives/api/serializers/type/subtype/aquatic_mechanical_treatment.py +++ b/api-rework/invasives/api/serializers/type/subtype/aquatic_mechanical_treatment.py @@ -1,11 +1,11 @@ from rest_framework import serializers -from api.models.activity import AquaticPlantMechanicalTreatment +from api.models.activity import AquaticPlantMechanicalTreatmentEntry from api.serializers.common import ShorelineTypesSerializer class AquaticPlantMechanicalTreatmentSerializer(serializers.ModelSerializer): class Meta: - model = AquaticPlantMechanicalTreatment + model = AquaticPlantMechanicalTreatmentEntry fields = ( "disposed_material_amount", "disposed_material_format", @@ -18,7 +18,7 @@ class Meta: class AquaticPlantTreatmentMechanicalSerializer(serializers.Serializer): entries = AquaticPlantMechanicalTreatmentSerializer( - source="aquaticplantmechanicaltreatment_set", many=True + source="aquaticplantmechanicaltreatmententry_set", many=True ) authorization_info = serializers.CharField( source="aquaticmechanicalauthorization.authorization_information" diff --git a/api-rework/invasives/api/serializers/type/subtype/aquatic_observation.py b/api-rework/invasives/api/serializers/type/subtype/aquatic_observation.py index a0ceafb01..2d733ebb6 100644 --- a/api-rework/invasives/api/serializers/type/subtype/aquatic_observation.py +++ b/api-rework/invasives/api/serializers/type/subtype/aquatic_observation.py @@ -1,7 +1,7 @@ from rest_framework import serializers from api.serializers.common import ShorelineTypesSerializer from api.models.activity import ( - AquaticPlantObservationDetail, + AquaticPlantObservationEntry, AquaticVoucherSpecimen, WaterbodySubstrateType, WaterbodyOutflowPermanent, @@ -9,7 +9,7 @@ WaterbodyInflowPermanent, WaterbodyInflowSeasonal, WaterbodyType, - WaterbodyData, + WaterbodyContext, WaterbodyUse, WaterbodyLevelManagement, WaterbodyAdjacentLandUse, @@ -101,7 +101,7 @@ def to_representation(self, instance): class WaterbodyDataSerializer(serializers.ModelSerializer): class Meta: - model = WaterbodyData + model = WaterbodyContext fields = ( "access", "colour", @@ -133,11 +133,11 @@ class Meta: ) -class AquaticPlantObservationDetailSerializer(serializers.ModelSerializer): +class AquaticPlantObservationEntrySerializer(serializers.ModelSerializer): voucher_specimen = serializers.SerializerMethodField() class Meta: - model = AquaticPlantObservationDetail + model = AquaticPlantObservationEntry fields = ( "density", "distribution", @@ -169,8 +169,8 @@ class AquaticObservationSerializer(serializers.Serializer): adjacent_land_use = WaterbodyAdjacentLandUseSerializer( source="waterbodyadjacentlanduse_set", many=True ) - entries = AquaticPlantObservationDetailSerializer( - source="aquaticplantobservationdetail_set", many=True + entries = AquaticPlantObservationEntrySerializer( + source="aquaticplantobservationentry_set", many=True ) pretreatment_observation = serializers.CharField( source="pretreatmentobservation.pre_treatment_observation" @@ -182,7 +182,7 @@ class AquaticObservationSerializer(serializers.Serializer): # suitable_for_biocontrol = serializers.CharField( # source="suitableforbiocontrol.suitable_for_biocontrol" # ) - waterbody_context = WaterbodyDataSerializer(source="waterbodydata") + waterbody_context = WaterbodyDataSerializer(source="waterbodycontext") water_use = WaterbodyUseSerializer(source="waterbodyuse_set", many=True) waterlevel_management = WaterbodyLevelManagementSerializer( source="waterbodylevelmanagement_set", many=True diff --git a/api-rework/invasives/api/serializers/type/subtype/biocontrol_collection.py b/api-rework/invasives/api/serializers/type/subtype/biocontrol_collection.py index f099897a5..a2ebcf9d6 100644 --- a/api-rework/invasives/api/serializers/type/subtype/biocontrol_collection.py +++ b/api-rework/invasives/api/serializers/type/subtype/biocontrol_collection.py @@ -3,20 +3,20 @@ WeatherConditionsSerializer, MicrositeConditionSerializer, TargetPlantPhenologySerializer, - TerrestrialBiocontrolAgentCountSimpleSerializer, + TerrestrialBiocontrolAgentCountSerializer, ) from api.models.activity import ( - TerrestrialBiocontrolCollectionInformation, - TerrestrialBiocontrolAgentCountSimple, + TerrestrialBiocontrolCollectionEntry, + TerrestrialBiocontrolAgentCount, ) -class TerrestrialBiocontrolCollectionInfoSerializer(serializers.ModelSerializer): +class TerrestrialBiocontrolCollectionEntrySerializer(serializers.ModelSerializer): actual_biological_agents = serializers.SerializerMethodField() estimated_biological_agents = serializers.SerializerMethodField() class Meta: - model = TerrestrialBiocontrolCollectionInformation + model = TerrestrialBiocontrolCollectionEntry fields = ( "actual_biological_agents", "estimated_biological_agents", @@ -34,22 +34,22 @@ class Meta: ) def get_actual_biological_agents(self, obj): - qs = TerrestrialBiocontrolAgentCountSimple.objects.filter( + qs = TerrestrialBiocontrolAgentCount.objects.filter( activity=obj.activity, is_estimate=False, invasive_plant=obj.invasive_plant, biocontrol_agent=obj.biological_agent, ) - return TerrestrialBiocontrolAgentCountSimpleSerializer(qs, many=True).data + return TerrestrialBiocontrolAgentCountSerializer(qs, many=True).data def get_estimated_biological_agents(self, obj): - qs = TerrestrialBiocontrolAgentCountSimple.objects.filter( + qs = TerrestrialBiocontrolAgentCount.objects.filter( activity=obj.activity, is_estimate=True, invasive_plant=obj.invasive_plant, biocontrol_agent=obj.biological_agent, ) - return TerrestrialBiocontrolAgentCountSimpleSerializer(qs, many=True).data + return TerrestrialBiocontrolAgentCountSerializer(qs, many=True).data class BiocontrolCollectionSerializer(serializers.Serializer): @@ -58,8 +58,8 @@ class BiocontrolCollectionSerializer(serializers.Serializer): target_plant_phenology = TargetPlantPhenologySerializer( source="targetplantphenology" ) - entries = TerrestrialBiocontrolCollectionInfoSerializer( - source="terrestrialbiocontrolcollectioninformation_set", many=True + entries = TerrestrialBiocontrolCollectionEntrySerializer( + source="terrestrialbiocontrolcollectionentry_set", many=True ) def to_representation(self, instance): diff --git a/api-rework/invasives/api/serializers/type/subtype/biocontrol_dispersal_monitoring.py b/api-rework/invasives/api/serializers/type/subtype/biocontrol_dispersal_monitoring.py index 1122633da..ec32e343d 100644 --- a/api-rework/invasives/api/serializers/type/subtype/biocontrol_dispersal_monitoring.py +++ b/api-rework/invasives/api/serializers/type/subtype/biocontrol_dispersal_monitoring.py @@ -10,7 +10,7 @@ class BiocontrolDispersalMonitoringSerializer(serializers.Serializer): microsite_condition = MicrositeConditionSerializer(source="micrositecondition") entries = TerrestrialBiologicalMonitoringEntriesSerializer( - source="terrestrialbiocontroldispersalmonitoring_set", many=True + source="terrestrialbiocontroldispersalmonitoringentry_set", many=True ) target_plant_phenology = TargetPlantPhenologySerializer( source="targetplantphenology" diff --git a/api-rework/invasives/api/serializers/type/subtype/biocontrol_release.py b/api-rework/invasives/api/serializers/type/subtype/biocontrol_release.py index b4aa54d2e..662c1aca4 100644 --- a/api-rework/invasives/api/serializers/type/subtype/biocontrol_release.py +++ b/api-rework/invasives/api/serializers/type/subtype/biocontrol_release.py @@ -1,10 +1,10 @@ from rest_framework import serializers from api.models.activity import ( - TerrestrialBiocontrolRelease, - TerrestrialBiocontrolAgentCountSimple, + TerrestrialBiocontrolReleaseEntry, + TerrestrialBiocontrolAgentCount, ) from api.serializers.common import ( - TerrestrialBiocontrolAgentCountSimpleSerializer, + TerrestrialBiocontrolAgentCountSerializer, TargetPlantPhenologySerializer, MicrositeConditionSerializer, WeatherConditionsSerializer, @@ -16,7 +16,7 @@ class TerrestrialBiocontrolReleaseSerializer(serializers.ModelSerializer): estimated_biological_agents = serializers.SerializerMethodField() class Meta: - model = TerrestrialBiocontrolRelease + model = TerrestrialBiocontrolReleaseEntry fields = ( "actual_biological_agents", "agent_source", @@ -31,27 +31,27 @@ class Meta: ) def get_actual_biological_agents(self, obj): - qs = TerrestrialBiocontrolAgentCountSimple.objects.filter( + qs = TerrestrialBiocontrolAgentCount.objects.filter( activity=obj.activity, is_estimate=False, invasive_plant=obj.invasive_plant, biocontrol_agent=obj.biocontrol_agent, ) - return TerrestrialBiocontrolAgentCountSimpleSerializer(qs, many=True).data + return TerrestrialBiocontrolAgentCountSerializer(qs, many=True).data def get_estimated_biological_agents(self, obj): - qs = TerrestrialBiocontrolAgentCountSimple.objects.filter( + qs = TerrestrialBiocontrolAgentCount.objects.filter( activity=obj.activity, is_estimate=True, invasive_plant=obj.invasive_plant, biocontrol_agent=obj.biocontrol_agent, ) - return TerrestrialBiocontrolAgentCountSimpleSerializer(qs, many=True).data + return TerrestrialBiocontrolAgentCountSerializer(qs, many=True).data class BiocontrolReleaseSerializer(serializers.Serializer): entries = TerrestrialBiocontrolReleaseSerializer( - source="terrestrialbiocontrolrelease_set", many=True + source="terrestrialbiocontrolreleaseentry_set", many=True ) target_plant_phenology = TargetPlantPhenologySerializer( source="targetplantphenology" diff --git a/api-rework/invasives/api/serializers/type/subtype/biocontrol_release_monitoring.py b/api-rework/invasives/api/serializers/type/subtype/biocontrol_release_monitoring.py index 4d0453518..f93caddd3 100644 --- a/api-rework/invasives/api/serializers/type/subtype/biocontrol_release_monitoring.py +++ b/api-rework/invasives/api/serializers/type/subtype/biocontrol_release_monitoring.py @@ -11,7 +11,7 @@ class BiocontrolReleaseMonitoringSerializer(serializers.Serializer): microsite_condition = MicrositeConditionSerializer(source="micrositecondition") entries = TerrestrialBiologicalMonitoringEntriesSerializer( - source="terrestrialbiocontroldispersalmonitoring_set", many=True + source="terrestrialbiocontroldispersalmonitoringentry_set", many=True ) target_plant_phenology = TargetPlantPhenologySerializer( source="targetplantphenology" diff --git a/api-rework/invasives/api/serializers/type/subtype/chemical_treatment_monitoring.py b/api-rework/invasives/api/serializers/type/subtype/chemical_treatment_monitoring.py index 354ae5f2a..e53cd3577 100644 --- a/api-rework/invasives/api/serializers/type/subtype/chemical_treatment_monitoring.py +++ b/api-rework/invasives/api/serializers/type/subtype/chemical_treatment_monitoring.py @@ -7,7 +7,7 @@ class ChemicalMonitoringSerializer(serializers.Serializer): entries = serializers.SerializerMethodField() - well_entries = NearestWellSerializer(source="nearestwell_set", many=True) + well_entries = NearestWellSerializer(source="wellentry_set", many=True) def get_entries(self, obj): return TreatmentMonitoringEntriesSerializer(obj, context=self.context).data diff --git a/api-rework/invasives/api/serializers/type/subtype/terrestrial_chemical_treatment.py b/api-rework/invasives/api/serializers/type/subtype/terrestrial_chemical_treatment.py index 509419a3c..a5daca914 100644 --- a/api-rework/invasives/api/serializers/type/subtype/terrestrial_chemical_treatment.py +++ b/api-rework/invasives/api/serializers/type/subtype/terrestrial_chemical_treatment.py @@ -6,8 +6,8 @@ class TerrestrialChemicalTreatmentSerializer(serializers.Serializer): - details = ChemicalTreatmentContextSerializer(source="chemtreatment") - well_entries = NearestWellSerializer(source="nearestwell_set", many=True) + details = ChemicalTreatmentContextSerializer(source="chemtreatmentcontext") + well_entries = NearestWellSerializer(source="wellentry_set", many=True) entries = serializers.SerializerMethodField() def get_entries(self, obj): diff --git a/api-rework/invasives/api/serializers/type/subtype/terrestrial_mechanical_treatment.py b/api-rework/invasives/api/serializers/type/subtype/terrestrial_mechanical_treatment.py index fbc6691ec..193675312 100644 --- a/api-rework/invasives/api/serializers/type/subtype/terrestrial_mechanical_treatment.py +++ b/api-rework/invasives/api/serializers/type/subtype/terrestrial_mechanical_treatment.py @@ -1,10 +1,10 @@ from rest_framework import serializers -from api.models.activity import TerrestrialPlantMechanicalTreatment +from api.models.activity import TerrestrialPlantMechanicalTreatmentEntry class TerrestrialPlantMechanicalTreatmentSerializer(serializers.ModelSerializer): class Meta: - model = TerrestrialPlantMechanicalTreatment + model = TerrestrialPlantMechanicalTreatmentEntry fields = ( "disposed_material_amount", "disposed_material_format", @@ -17,5 +17,5 @@ class Meta: class TerrestrialPlantTreatmentMechanicalSerializer(serializers.Serializer): entries = TerrestrialPlantMechanicalTreatmentSerializer( - source="terrestrialplantmechanicaltreatment_set", many=True + source="terrestrialplantmechanicaltreatmententry_set", many=True ) diff --git a/api-rework/invasives/api/serializers/type/subtype/terrestrial_observation.py b/api-rework/invasives/api/serializers/type/subtype/terrestrial_observation.py index ae63243d3..9b02b4cda 100644 --- a/api-rework/invasives/api/serializers/type/subtype/terrestrial_observation.py +++ b/api-rework/invasives/api/serializers/type/subtype/terrestrial_observation.py @@ -2,11 +2,11 @@ from rest_framework import serializers -from api.models.activity import TerrestrialBiocontrolRelease +from api.models.activity import TerrestrialBiocontrolReleaseEntry from api.models.activity.observations import ( - TerrestrialPlantObservationDetail, + TerrestrialPlantObservationEntries, TerrestrialVoucherSpecimen, - TerrestrialPlantObservationInfo, + TerrestrialPlantObservationContext, ) from api.models.codes import ( AspectCode, @@ -70,7 +70,7 @@ class TerrestrialPlantObservationContextSerializer(serializers.ModelSerializer): voucher_specimen = serializers.SerializerMethodField() class Meta: - model = TerrestrialPlantObservationDetail + model = TerrestrialPlantObservationEntries fields = ( "density", "distribution", @@ -104,7 +104,7 @@ class TerrestrialPlantObservationEntriesSerializer(serializers.ModelSerializer): slope_percent = SlopeCodeSerializer() class Meta: - model = TerrestrialPlantObservationInfo + model = TerrestrialPlantObservationContext fields = ( "research_observation", "visible_well_nearby", @@ -118,10 +118,10 @@ class Meta: class TerrestrialObservationSerializer(serializers.Serializer): entries = TerrestrialPlantObservationContextSerializer( - source="terrestrialplantobservationdetail_set", many=True + source="terrestrialplantobservationentries_set", many=True ) context = TerrestrialPlantObservationEntriesSerializer( - source="terrestrialplantobservationinfo" + source="terrestrialplantobservationcontext" ) pretreatment_observation = serializers.CharField( source="pretreatmentobservation.pre_treatment_observation"