refactor: rename SiteDataPush to UserDataPush

Author: knipec

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
     -   id: pre-commit-update
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.4
+    rev: v0.14.5
     hooks:
     -   id: ruff-check
         args: [--fix]

terraso_backend/apps/graphql/schema/schema.graphql

@@ -1682,9 +1682,9 @@ type Mutations {
   deleteUserFromProject(input: ProjectDeleteUserMutationInput!): ProjectDeleteUserMutationPayload!
   updateUserRoleInProject(input: ProjectUpdateUserRoleMutationInput!): ProjectUpdateUserRoleMutationPayload!
   markProjectSeen(input: ProjectMarkSeenMutationInput!): ProjectMarkSeenMutationPayload!
-  updateSoilData(input: SoilDataUpdateMutationInput!): SoilDataUpdateMutationPayload! @deprecated(reason: "Use push_site_data instead.")
-  updateDepthDependentSoilData(input: DepthDependentSoilDataUpdateMutationInput!): DepthDependentSoilDataUpdateMutationPayload! @deprecated(reason: "Use push_site_data instead.")
-  pushSoilData(input: SoilDataPushInput!): SoilDataPushPayload! @deprecated(reason: "Use push_site_data instead.")
+  updateSoilData(input: SoilDataUpdateMutationInput!): SoilDataUpdateMutationPayload! @deprecated(reason: "Use push_user_data instead.")
+  updateDepthDependentSoilData(input: DepthDependentSoilDataUpdateMutationInput!): DepthDependentSoilDataUpdateMutationPayload! @deprecated(reason: "Use push_user_data instead.")
+  pushSoilData(input: SoilDataPushInput!): SoilDataPushPayload! @deprecated(reason: "Use push_user_data instead.")
 
   """
   To enable offline functionality.
@@ -1694,10 +1694,10 @@ type Mutations {
   
   Partial updates are possible, if failure happens at the level of a sub-mutation, or more granularly within the sub-mutation.
   """
-  pushSiteData(input: SiteDataPushInput!): SiteDataPushPayload!
-  updateSoilDataDepthInterval(input: SoilDataUpdateDepthIntervalMutationInput!): SoilDataUpdateDepthIntervalMutationPayload! @deprecated(reason: "Use push_site_data instead.")
-  deleteSoilDataDepthInterval(input: SoilDataDeleteDepthIntervalMutationInput!): SoilDataDeleteDepthIntervalMutationPayload! @deprecated(reason: "Use push_site_data instead.")
-  updateSoilMetadata(input: SoilMetadataUpdateMutationInput!): SoilMetadataUpdateMutationPayload! @deprecated(reason: "Use push_site_data instead.")
+  pushUserData(input: UserDataPushInput!): UserDataPushPayload!
+  updateSoilDataDepthInterval(input: SoilDataUpdateDepthIntervalMutationInput!): SoilDataUpdateDepthIntervalMutationPayload! @deprecated(reason: "Use push_user_data instead.")
+  deleteSoilDataDepthInterval(input: SoilDataDeleteDepthIntervalMutationInput!): SoilDataDeleteDepthIntervalMutationPayload! @deprecated(reason: "Use push_user_data instead.")
+  updateSoilMetadata(input: SoilMetadataUpdateMutationInput!): SoilMetadataUpdateMutationPayload! @deprecated(reason: "Use push_user_data instead.")
   updateProjectSoilSettings(input: ProjectSoilSettingsUpdateMutationInput!): ProjectSoilSettingsUpdateMutationPayload!
   updateProjectSoilSettingsDepthInterval(input: ProjectSoilSettingsUpdateDepthIntervalMutationInput!): ProjectSoilSettingsUpdateDepthIntervalMutationPayload!
   deleteProjectSoilSettingsDepthInterval(input: ProjectSoilSettingsDeleteDepthIntervalMutationInput!): ProjectSoilSettingsDeleteDepthIntervalMutationPayload!
@@ -2436,7 +2436,7 @@ Pushes at least one of the following sub-mutations:
 
 Partial updates are possible, if failure happens at the level of a sub-mutation, or more granularly within the sub-mutation.
 """
-type SiteDataPushPayload {
+type UserDataPushPayload {
   errors: GenericScalar
   soilDataResults: [SoilDataPushEntry!]
   soilMetadataResults: [SoilMetadataPushEntry!]
@@ -2464,7 +2464,7 @@ enum SoilMetadataPushFailureReason {
   INVALID_DATA
 }
 
-input SiteDataPushInput {
+input UserDataPushInput {
   soilDataEntries: [SoilDataPushInputEntry!] = null
   soilMetadataEntries: [SoilMetadataPushInputEntry!] = null
   clientMutationId: String

terraso_backend/apps/graphql/schema/schema.py

@@ -32,7 +32,6 @@
     SiteNoteDeleteMutation,
     SiteNoteUpdateMutation,
 )
-from apps.soil_id.graphql.site_data.push_mutation import SiteDataPush
 from apps.soil_id.graphql.soil_data.mutations import (
     DepthDependentSoilDataUpdateMutation,
     SoilDataDeleteDepthIntervalMutation,
@@ -47,6 +46,7 @@
     ProjectSoilSettingsUpdateDepthIntervalMutation,
     ProjectSoilSettingsUpdateMutation,
 )
+from apps.soil_id.graphql.sync.push_mutation import UserDataPush
 
 from .commons import TerrasoRelayNode
 from .data_entries import (
@@ -193,21 +193,21 @@ class Mutations(graphene.ObjectType):
     update_user_role_in_project = ProjectUpdateUserRoleMutation.Field()
     mark_project_seen = ProjectMarkSeenMutation.Field()
     update_soil_data = SoilDataUpdateMutation.Field(
-        deprecation_reason="Use push_site_data instead."
+        deprecation_reason="Use push_user_data instead."
     )
     update_depth_dependent_soil_data = DepthDependentSoilDataUpdateMutation.Field(
-        deprecation_reason="Use push_site_data instead."
+        deprecation_reason="Use push_user_data instead."
     )
-    push_soil_data = SoilDataPush.Field(deprecation_reason="Use push_site_data instead.")
-    push_site_data = SiteDataPush.Field()
+    push_soil_data = SoilDataPush.Field(deprecation_reason="Use push_user_data instead.")
+    push_user_data = UserDataPush.Field()
     update_soil_data_depth_interval = SoilDataUpdateDepthIntervalMutation.Field(
-        deprecation_reason="Use push_site_data instead."
+        deprecation_reason="Use push_user_data instead."
     )
     delete_soil_data_depth_interval = SoilDataDeleteDepthIntervalMutation.Field(
-        deprecation_reason="Use push_site_data instead."
+        deprecation_reason="Use push_user_data instead."
     )
     update_soil_metadata = SoilMetadataUpdateMutation.Field(
-        deprecation_reason="Use push_site_data instead."
+        deprecation_reason="Use push_user_data instead."
     )
     update_project_soil_settings = ProjectSoilSettingsUpdateMutation.Field()
     update_project_soil_settings_depth_interval = (

terraso_backend/apps/graphql/views.py

@@ -13,16 +13,68 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see https://www.gnu.org/licenses/.
 
+import re
+
+import structlog
 from django.views.generic import TemplateView
 from graphene_django.views import GraphQLView
 
 from apps.auth.mixins import AuthenticationRequiredMixin
 
+logger = structlog.get_logger(__name__)
+
 
 class TerrasoGraphQLView(AuthenticationRequiredMixin, GraphQLView):
     def get_auth_enabled(self):
         return False
 
+    def _extract_operation_name(self, query, operation_name):
+        """Extract operation name from query string if not explicitly provided"""
+        if operation_name:
+            return operation_name
+
+        if not query:
+            return "unnamed"
+
+        query = query.strip()
+
+        # Try to find named operation: mutation OperationName or query OperationName
+        match = re.search(r"(?:mutation|query)\s+(\w+)", query)
+        if match:
+            return match.group(1)
+
+        # Try to find field name in anonymous operation: mutation { fieldName or query { fieldName
+        match = re.search(r"(?:mutation|query)\s*\{\s*(\w+)", query)
+        if match:
+            return match.group(1)
+
+        # For simple queries without mutation/query keyword: { fieldName
+        match = re.search(r"^\{\s*(\w+)", query)
+        if match:
+            return match.group(1)
+
+        return "unnamed"
+
+    def execute_graphql_request(
+        self, request, data, query, variables, operation_name, show_graphiql=False
+    ):
+        """Override to log GraphQL operation names before execution"""
+
+        # Extract operation name from query if not provided
+        extracted_operation = self._extract_operation_name(query, operation_name)
+
+        # Log the GraphQL operation
+        logger.info(
+            "GraphQL operation",
+            operation_name=extracted_operation,
+            is_mutation=query.strip().startswith("mutation") if query else False,
+        )
+
+        # Call parent implementation
+        return super().execute_graphql_request(
+            request, data, query, variables, operation_name, show_graphiql
+        )
+
 
 class TerrasoGraphQLDocs(TemplateView):
     template_name = "docs.html"

terraso_backend/apps/soil_id/graphql/soil_metadata/push_mutation.py

@@ -60,7 +60,7 @@ class SoilMetadataPushInputEntry(graphene.InputObjectType):
 
 class SoilMetadataPush(BaseWriteMutation):
     """
-    Note: as of 2025-10 this mutation is not exposed on its own; it is only used as part of SiteDataPush (similar to how SiteDataPush uses SoilDataPush).
+    Note: as of 2025-10 this mutation is not exposed on its own; it is only used as part of UserDataPush (similar to how UserDataPush uses SoilDataPush).
     """
 
     results = graphene.Field(graphene.List(graphene.NonNull(SoilMetadataPushEntry)), required=True)

terraso_backend/apps/soil_id/graphql/site_data/push_mutation.py renamed to terraso_backend/apps/soil_id/graphql/sync/push_mutation.py

@@ -32,7 +32,7 @@
 logger = structlog.get_logger(__name__)
 
 
-class SiteDataPush(BaseWriteMutation):
+class UserDataPush(BaseWriteMutation):
     """
     To enable offline functionality.
     Pushes at least one of the following sub-mutations: