[OSDEV-1158] API. Create POST endpoint for v1/production-locations to support SLC & API Mod.

doc/release/RELEASE-NOTES.md

@@ -12,23 +12,38 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Database changes
 #### Migrations:
-* *Describe migrations here.*
+* 0162_update_moderationevent_table_fields.py - This migration updates the ModerationEvent table and its constraints.
 
 #### Scheme changes
-* *Describe scheme changes here.*
+* [OSDEV-1158](https://opensupplyhub.atlassian.net/browse/OSDEV-1158) - The following updates to the ModerationEvent table have been made:
+    1. Set `uuid` as the primary key.
+    2. Make `geocode_result` field optional. It can be blank if lat and lng
+    have been provided by user.
+    3. Remove redundant `blank=False` and `null=False` constraints, as these are
+    the default values for model fields in Django and do not need to be
+    explicitly set.
+    4. Make `contributor` field non-nullable, as the field should not be left
+    empty. It is required to have information about the contributor.
+    5. Allow `claim` field to be blank. This change reflects the fact that
+    a moderation event may not always be related to a claim, so the field can
+    be left empty.
 
 ### Code/API changes
 * [OSDEV-1453](https://opensupplyhub.atlassian.net/browse/OSDEV-1453) - The `detail` keyword instead of `message` has been applied in error response objects for V1 endpoints.
-* [OSDEV-1346](https://opensupplyhub.atlassian.net/browse/OSDEV-1346) - Disabled null values from the response of the OpenSearch. Disabled possible null `os_id`, `claim_id` and `source` from `PATCH api/v1/moderation-events/{moderation_id}` response.
-* [OSDEV-1410](https://opensupplyhub.atlassian.net/browse/OSDEV-1410) - Introduced new POST `/api/moderation-events/{moderation_id}/production-locations` endpoint
+* [OSDEV-1346](https://opensupplyhub.atlassian.net/browse/OSDEV-1346) - Disabled null values from the response of the OpenSearch. Disabled possible null `os_id`, `claim_id` and `source` from `PATCH /api/v1/moderation-events/{moderation_id}/` response.
+* [OSDEV-1410](https://opensupplyhub.atlassian.net/browse/OSDEV-1410) - Introduced a new POST `/api/v1/moderation-events/{moderation_id}/production-locations/` endpoint
 * [OSDEV-1449](https://opensupplyhub.atlassian.net/browse/OSDEV-1449) - **Breaking changes** to the following endpoints:
-  - GET `v1/moderation-events`
-  - GET `v1/production-locations`
+  - GET `v1/moderation-events/`
+  - GET `v1/production-locations/`
 
   **Changes include:**
   - Refactored `sort_by` parameter to improve sorting functionality.
   - Split `search_after` parameter into `search_after_value` and `search_after_id` for better pagination control.
 
+* [OSDEV-1158](https://opensupplyhub.atlassian.net/browse/OSDEV-1158) - The following features and improvements have been made:
+    1. Introduced a new POST `/api/v1/production-locations/` endpoint based on the API v1 specification. This endpoint allows the creation of a new moderation event for the production location creation with the given details.
+    2. Removed redundant redefinition of paths via the `as_view` method for all the v1 API endpoints since they are already defined via `DefaultRouter`.
+
 ### Architecture/Environment changes
 * [OSDEV-1170](https://opensupplyhub.atlassian.net/browse/OSDEV-1170) - Added the ability to automatically create a dump from the latest shared snapshot of the anonymized database from Production environment for use in the Test and Pre-Prod environments.
 
@@ -40,6 +55,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Release instructions:
 * Ensure that the following commands are included in the `post_deployment` command:
+    * `migrate`
     * `reindex_database`
 
 

src/dedupe-hub/api/app/main.py

@@ -22,7 +22,6 @@
 consumer_task = None
 consumer = None
 
-# initialize logger
 logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s',
                     level=logging.INFO)
 log = logging.getLogger(__name__)

src/dedupe-hub/api/app/matching/matcher/exact/exact_matcher.py

@@ -9,7 +9,6 @@
 from app.matching.matcher.exact.exact_item_match import ExactItemMatch
 from app.database.sqlalchemy import get_session
 
-# initialize logger
 logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s',
                     level=logging.INFO)
 log = logging.getLogger(__name__)

src/dedupe-hub/api/app/matching/matcher/gazeteer/gazetteer_matcher.py

@@ -22,7 +22,6 @@
 from app.matching.matcher.gazeteer.gazetteer_helper import normalize_extended_facility_id
 from app.database.sqlalchemy import get_session
 
-# initialize logger
 logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s',
                     level=logging.INFO)
 log = logging.getLogger(__name__)

src/dedupe-hub/api/app/matching/process_match.py

@@ -5,7 +5,6 @@
 from app.matching.DTOs.facility_list_item_dto import FacilityListItemDict
 from app.matching.DTOs.facility_match_dto import FacilityMatchDTO
 
-# initialize logger
 logging.basicConfig(format='%(asctime)s - %(levelname)s - %(message)s',
                     level=logging.INFO)
 log = logging.getLogger(__name__)

src/django/api/constants.py

@@ -192,12 +192,49 @@ class NumberOfWorkersRanges:
     }]
 
 
-class ErrorMessages:
-    GEOCODED_NO_RESULTS = "The address you submitted can not be geocoded."
+class APIErrorMessages:
+    GEOCODED_NO_RESULTS = 'The address you submitted can not be geocoded.'
     MAINTENANCE_MODE = ('Open Supply Hub is undergoing maintenance and '
                         'not accepting new data at the moment. Please '
                         'try again in a few minutes.')
 
 
 class FacilitiesDownloadSettings:
     DEFAULT_LIMIT = 10000
+
+
+# API v1
+class APIV1CommonErrorMessages:
+    COMMON_REQ_BODY_ERROR = 'The request body is invalid.'
+    COMMON_INTERNAL_ERROR = (
+        'An unexpected error occurred while processing the request.'
+    )
+    COMMON_REQ_QUERY_ERROR = 'The request query is invalid.'
+    MAINTENANCE_MODE = (
+        'Open Supply Hub is undergoing maintenance and not accepting new data '
+        'at the moment. Please try again in a few minutes.'
+    )
+
+
+class APIV1LocationContributionErrorMessages:
+    GEOCODED_NO_RESULTS = (
+        'A valid address could not be found for the provided country and '
+        'address. This may be due to incorrect, incomplete, or ambiguous '
+        'information. Please verify and try again.'
+    )
+
+    @staticmethod
+    def invalid_data_type_error(data_type: str) -> str:
+        return ('Invalid data. Expected a dictionary (object), '
+                f'but got {data_type}.')
+
+
+# If the error isn’t field-specific, the non_field_errors key will be used
+# for issues spanning multiple fields or related to the overall data
+# object.
+NON_FIELD_ERRORS_KEY = 'non_field_errors'
+
+
+class APIV1LocationContributionKeys:
+    LNG = 'lng'
+    LAT = 'lat'

src/django/api/facility_actions/processing_facility_api.py

@@ -3,7 +3,7 @@
 import traceback
 from typing import Any, Dict, List, Union
 
-from api.constants import ErrorMessages, ProcessingAction
+from api.constants import APIErrorMessages, ProcessingAction
 from api.extended_fields import create_extendedfields_for_single_item
 from api.facility_actions.processing_facility import ProcessingFacility
 from api.geocoding import geocode_address
@@ -27,7 +27,6 @@
 from django.utils import timezone
 from django.core.exceptions import ValidationError
 
-# Initialize logger.
 log = logging.getLogger(__name__)
 
 
@@ -246,7 +245,7 @@ def __handle_geocode_result(
         else:
             item.status = FacilityListItem.GEOCODED_NO_RESULTS
             result['status'] = item.status
-            result['message'] = ErrorMessages.GEOCODED_NO_RESULTS
+            result['message'] = APIErrorMessages.GEOCODED_NO_RESULTS
 
         item.processing_results.append(
             {

src/django/api/facility_actions/processing_facility_list.py

@@ -18,7 +18,6 @@
 from contricleaner.lib.dto.row_dto import RowDTO
 from oar.rollbar import report_error_to_rollbar
 
-# Initialize logger.
 log = logging.getLogger(__name__)
 
 

src/django/api/migrations/0162_update_moderationevent_table_fields.py

@@ -0,0 +1,54 @@
+# Generated by Django 3.2.17 on 2024-11-26 16:27
+
+import django.contrib.postgres.indexes
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+    '''
+    This migration performs the following updates to the ModerationEvent table:
+    1. Set uuid as the primary key.
+    2. Make geocode_result field optional. It can be blank if lat and lng
+    have been provided by user.
+    3. Remove redundant blank=False and null=False constraints, as these are
+    the default values for model fields in Django and do not need to be
+    explicitly set.
+    4. Make contributor field non-nullable, as the field should not be left
+    empty. It is required to have information about the contributor.
+    5. Allow claim field to be blank. This change reflects the fact that
+    a moderation event may not always be related to a claim, so the field can
+    be left empty.
+    '''
+
+    dependencies = [
+        ('api', '0161_create_disable_list_uploading'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='moderationevent',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='moderationevent',
+            name='claim',
+            field=models.OneToOneField(blank=True, help_text='Linked claim id for this production location.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='moderation_event_claim', to='api.facilityclaim'),
+        ),
+        migrations.AlterField(
+            model_name='moderationevent',
+            name='contributor',
+            field=models.ForeignKey(help_text='Linked contributor responsible for this moderation event.', on_delete=django.db.models.deletion.PROTECT, related_name='moderation_event_contributor', to='api.contributor'),
+        ),
+        migrations.AlterField(
+            model_name='moderationevent',
+            name='geocode_result',
+            field=models.JSONField(blank=True, default=dict, help_text='Result of the geocode operation.'),
+        ),
+        migrations.AlterField(
+            model_name='moderationevent',
+            name='uuid',
+            field=models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, help_text='Unique identifier to make moderation event table more reusable across the app.', primary_key=True, serialize=False, unique=True),
+        ),
+    ]

src/django/api/models/moderation_event.py

@@ -24,6 +24,7 @@ class Source(models.TextChoices):
         SLC = 'SLC', 'SLC'
 
     uuid = models.UUIDField(
+        primary_key=True,
         default=uuid.uuid4,
         editable=False,
         unique=True,
@@ -54,7 +55,6 @@ class Source(models.TextChoices):
     contributor = models.ForeignKey(
         Contributor,
         on_delete=models.PROTECT,
-        null=True,
         related_name='moderation_event_contributor',
         help_text='Linked contributor responsible for this moderation event.'
     )
@@ -72,20 +72,18 @@ class Source(models.TextChoices):
         FacilityClaim,
         on_delete=models.SET_NULL,
         null=True,
+        blank=True,
         related_name='moderation_event_claim',
         help_text='Linked claim id for this production location.'
     )
 
     request_type = models.CharField(
         max_length=6,
-        null=False,
         choices=RequestType.choices,
         help_text='Type of moderation record.'
     )
 
     raw_data = models.JSONField(
-        null=False,
-        blank=False,
         default=dict,
         help_text=(
             'Key-value pairs of the non-parsed row and '
@@ -94,8 +92,6 @@ class Source(models.TextChoices):
     )
 
     cleaned_data = models.JSONField(
-        null=False,
-        blank=False,
         default=dict,
         help_text=(
             'Key-value pairs of the parsed row and '
@@ -104,8 +100,7 @@ class Source(models.TextChoices):
     )
 
     geocode_result = models.JSONField(
-        null=False,
-        blank=False,
+        blank=True,
         default=dict,
         help_text=(
             'Result of the geocode operation.'
@@ -116,7 +111,6 @@ class Source(models.TextChoices):
         max_length=8,
         choices=Status.choices,
         default=Status.PENDING,
-        null=False,
         help_text='Moderation status of the production location.'
     )
 

src/django/api/models/transactions/clean_facilitylistitems.py

@@ -2,7 +2,6 @@
 import logging
 from django.db import transaction, connection
 
-# Initialize logger.
 logger = logging.getLogger(__name__)
 
 

src/django/api/moderation_event_actions/creation/dtos/create_moderation_event_dto.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass, field
+from typing import Dict
+
+from rest_framework import status
+
+from api.models.moderation_event import ModerationEvent
+
+
+@dataclass
+class CreateModerationEventDTO:
+    contributor_id: int
+    raw_data: Dict
+    request_type: str
+    cleaned_data: Dict = field(default_factory=dict)
+    source: str = ''
+    geocode_result: Dict = field(default_factory=dict)
+    errors: Dict = field(default_factory=dict)
+    status_code: int = status.HTTP_202_ACCEPTED
+    moderation_event: ModerationEvent = None

src/django/api/moderation_event_actions/creation/event_creation_strategy.py

@@ -0,0 +1,12 @@
+from abc import ABC, abstractmethod
+
+from api.moderation_event_actions.creation.dtos.create_moderation_event_dto \
+    import CreateModerationEventDTO
+
+
+class EventCreationStrategy(ABC):
+    @abstractmethod
+    def serialize(
+            self,
+            event_dto: CreateModerationEventDTO) -> CreateModerationEventDTO:
+        pass

src/django/api/moderation_event_actions/creation/location_contribution/location_contribution.py

@@ -0,0 +1,46 @@
+from api.moderation_event_actions.creation.event_creation_strategy \
+    import EventCreationStrategy
+from api.moderation_event_actions.creation.location_contribution \
+    .processors.contribution_processor import ContributionProcessor
+from api.moderation_event_actions.creation.location_contribution \
+    .processors.source_processor import SourceProcessor
+from api.moderation_event_actions.creation.location_contribution \
+    .processors.production_location_data_processor \
+    import ProductionLocationDataProcessor
+from api.moderation_event_actions.creation.location_contribution \
+    .processors.geocoding_processor import GeocodingProcessor
+from api.moderation_event_actions.creation.dtos.create_moderation_event_dto \
+    import CreateModerationEventDTO
+
+
+class LocationContribution(EventCreationStrategy):
+    '''
+    The class-based algorithm that validates, extracts, and geocodes the
+    retrieved location data from the user before saving it as
+    a moderation event.
+    '''
+
+    def serialize(
+            self,
+            event_dto: CreateModerationEventDTO) -> CreateModerationEventDTO:
+        entry_location_data_processor = self.__setup_location_data_processors()
+
+        processed_location_data = entry_location_data_processor.process(
+            event_dto
+        )
+
+        return processed_location_data
+
+    @staticmethod
+    def __setup_location_data_processors() -> ContributionProcessor:
+        location_data_processors = (
+            SourceProcessor(),
+            ProductionLocationDataProcessor(),
+            GeocodingProcessor()
+        )
+        # Link each processor to the next one.
+        for current_processor, next_processor in zip(
+                location_data_processors, location_data_processors[1:]):
+            current_processor.set_next(next_processor)
+
+        return location_data_processors[0]