From abc3e3f3ad93c2780dea2c874342c61133d35cef Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Mon, 29 Jan 2024 14:18:04 -0800 Subject: [PATCH 1/3] readme changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 575876d28..0b3284e8d 100644 --- a/README.md +++ b/README.md @@ -200,4 +200,4 @@ Code released under the [Apache License, Version 2.0](https://github.com/bcgov/g More documentation for the repository can be found in the following places - [Frontend](/app/frontend/README.md) - [OpenShift](/openshift/README.md) -- [Tests](/tests/api-tests/README.md) +- [Tests](/tests/api-tests/README.md) From 555083412e020783040ecd58c421807960d30041 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Wed, 31 Jan 2024 15:30:19 -0800 Subject: [PATCH 2/3] wip --- app/backend/gwells/views/bulk.py | 34 ++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/app/backend/gwells/views/bulk.py b/app/backend/gwells/views/bulk.py index 8ecedf773..4d34a5b5b 100644 --- a/app/backend/gwells/views/bulk.py +++ b/app/backend/gwells/views/bulk.py @@ -22,10 +22,10 @@ from django.db import transaction from django.utils import timezone from django.contrib.gis.geos import Point - from aquifers.constants import AQUIFER_ID_FOR_UNCORRELATED_WELLS from aquifers.models import Aquifer, VerticalAquiferExtent, VerticalAquiferExtentsHistory -from wells.models import Well +from wells.models import Well, ActivitySubmission, FieldsProvided +from submissions.models import WellActivityCode from gwells.models.bulk import BulkWellAquiferCorrelationHistory from gwells.permissions import ( HasBulkWellAquiferCorrelationUploadRole, @@ -45,6 +45,7 @@ class BulkWellAquiferCorrelation(APIView): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.change_log = [] + self.change_log_activity_submission = [] self.create_date = timezone.now() self.unknown_well_tag_numbers = set() self.unknown_aquifer_ids = set() @@ -109,6 +110,7 @@ def post(self, request, **kwargs): 'aquiferId': aquifer_id } wells_to_update.append(well) + self.append_to_change_log_activity_submission(well_tag_number, aquifer_id) elif existing_aquifer_id != aquifer_id: # existing ids don't match - must be a change self.append_to_change_log(well_tag_number, aquifer_id, existing_aquifer_id) change = { @@ -116,6 +118,7 @@ def post(self, request, **kwargs): 'existingAquiferId': existing_aquifer_id, 'newAquiferId': aquifer_id } + self.append_to_change_log_activity_submission(well_tag_number, aquifer_id) wells_to_update.append(well) if change: @@ -217,6 +220,16 @@ def update_wells(self, wells): Well.objects.bulk_update(wells, ['aquifer']) # save the BulkWellAquiferCorrelation records BulkWellAquiferCorrelationHistory.objects.bulk_create(self.change_log) + # create a new row in activity submission table for each item in the array + for item in self.change_log_activity_submission: + activity_submission_object = ActivitySubmission.objects.create(create_user=item.create_user, + update_user=item.update_user, + create_date=item.create_date, + update_date=item.update_date, + well=item.well, + aquifer = item.aquifer, + well_activity_type=item.well_activity_type); + FieldsProvided.objects.create(activity_submission=activity_submission_object) def append_to_change_log(self, well_tag_number, to_aquifer_id, from_aquifer_id): bulk_history_item = BulkWellAquiferCorrelationHistory( @@ -228,6 +241,23 @@ def append_to_change_log(self, well_tag_number, to_aquifer_id, from_aquifer_id): ) self.change_log.append(bulk_history_item) + def append_to_change_log_activity_submission(self, well_tag_number, to_aquifer_id): + well_instance = Well.objects.get(pk=well_tag_number) + aquifer_instance = Aquifer.objects.get(pk=to_aquifer_id) + well_activity_code_instance = WellActivityCode.objects.get(pk=WellActivityCode.types.staff_edit().code) + activity_submission_item = ActivitySubmission( + create_user=self.request.user.profile.username, + update_user=self.request.user.profile.username, + create_date=self.create_date, + update_date=self.create_date, + well=well_instance, + aquifer = aquifer_instance, + well_activity_type=well_activity_code_instance + ) + self.change_log_activity_submission.append(activity_submission_item) + # FieldsProvided.objects.create(filing_number=activity_submission_object.pk) + + class BulkVerticalAquiferExtents(APIView): """ From 9c6b616b42f11e4b6eab546bf19045736a1b2b30 Mon Sep 17 00:00:00 2001 From: Sanjay Babu Date: Fri, 2 Feb 2024 14:40:20 -0800 Subject: [PATCH 3/3] fixed aquifer number reversion --- app/backend/gwells/views/bulk.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/backend/gwells/views/bulk.py b/app/backend/gwells/views/bulk.py index 4d34a5b5b..2649cd5b1 100644 --- a/app/backend/gwells/views/bulk.py +++ b/app/backend/gwells/views/bulk.py @@ -240,7 +240,8 @@ def append_to_change_log(self, well_tag_number, to_aquifer_id, from_aquifer_id): create_date=self.create_date ) self.change_log.append(bulk_history_item) - + + # add activity submission objects to the array def append_to_change_log_activity_submission(self, well_tag_number, to_aquifer_id): well_instance = Well.objects.get(pk=well_tag_number) aquifer_instance = Aquifer.objects.get(pk=to_aquifer_id) @@ -255,10 +256,8 @@ def append_to_change_log_activity_submission(self, well_tag_number, to_aquifer_i well_activity_type=well_activity_code_instance ) self.change_log_activity_submission.append(activity_submission_item) - # FieldsProvided.objects.create(filing_number=activity_submission_object.pk) - class BulkVerticalAquiferExtents(APIView): """ Changes multiple vertical aquifer extents all at once