Address bug in get user contributions

Author: maxachis

src/api/endpoints/annotate/all/get/queries/convert.py

@@ -5,7 +5,7 @@
 from src.core.enums import RecordType
 from src.db.models.impl.flag.url_validated.enums import URLType
 from src.db.models.impl.url.suggestion.record_type.user import UserRecordTypeSuggestion
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 
 
 def convert_user_url_type_suggestion_to_url_type_annotation_suggestion(

src/api/endpoints/annotate/all/get/queries/core.py

@@ -11,7 +11,7 @@
 from src.db.models.impl.url.suggestion.agency.user import UserURLAgencySuggestion
 from src.db.models.impl.url.suggestion.location.user.sqlalchemy import UserLocationSuggestion
 from src.db.models.impl.url.suggestion.record_type.user import UserRecordTypeSuggestion
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 from src.db.models.views.unvalidated_url import UnvalidatedURL
 from src.db.models.views.url_anno_count import URLAnnotationCount
 from src.db.models.views.url_annotations_flags import URLAnnotationFlagsView

src/api/endpoints/annotate/all/post/requester.py

@@ -11,7 +11,7 @@
 from src.db.models.impl.url.suggestion.name.enums import NameSuggestionSource
 from src.db.models.impl.url.suggestion.name.sqlalchemy import URLNameSuggestion
 from src.db.models.impl.url.suggestion.record_type.user import UserRecordTypeSuggestion
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 from src.db.templates.requester import RequesterBase
 
 

src/api/endpoints/contributions/shared/contributions.py

@@ -1,6 +1,6 @@
 from sqlalchemy import select, func, CTE, Column
 
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 
 
 class ContributionsCTEContainer:

src/api/endpoints/contributions/user/queries/agreement/url_type.py

@@ -3,7 +3,7 @@
 from src.api.endpoints.contributions.user.queries.annotated_and_validated import AnnotatedAndValidatedCTEContainer
 from src.api.endpoints.contributions.user.queries.templates.agreement import AgreementCTEContainer
 from src.db.models.impl.flag.url_validated.sqlalchemy import FlagURLValidated
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 
 
 def get_url_type_agreement_cte_container(

src/api/endpoints/contributions/user/queries/annotated_and_validated.py

@@ -1,7 +1,7 @@
 from sqlalchemy import select, Column, CTE
 
 from src.db.models.impl.flag.url_validated.sqlalchemy import FlagURLValidated
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 
 
 class AnnotatedAndValidatedCTEContainer:

src/api/endpoints/contributions/user/queries/core.py

@@ -45,15 +45,18 @@ async def run(self, session: AsyncSession) -> ContributionsUserResponse:
                 url_type_agree.cte,
                 contributions_cte.user_id == url_type_agree.user_id
             )
+            .where(
+                contributions_cte.user_id == self.user_id
+            )
         )
 
         mapping: RowMapping = await sh.mapping(session, query=query)
 
         return ContributionsUserResponse(
             count_validated=mapping.count,
             agreement=ContributionsUserAgreement(
-                record_type=mapping.record_type,
-                agency=mapping.agency,
-                url_type=mapping.url_type
+                record_type=mapping.record_type or 0,
+                agency=mapping.agency or 0,
+                url_type=mapping.url_type or 0
             )
         )

src/api/endpoints/metrics/urls/breakdown/query/core.py

@@ -10,7 +10,7 @@
 from src.db.models.impl.url.core.sqlalchemy import URL
 from src.db.models.impl.url.suggestion.agency.user import UserURLAgencySuggestion
 from src.db.models.impl.url.suggestion.record_type.user import UserRecordTypeSuggestion
-from src.db.models.impl.url.suggestion.relevant.user import UserURLTypeSuggestion
+from src.db.models.impl.url.suggestion.url_type.user import UserURLTypeSuggestion
 from src.db.queries.base.builder import QueryBuilderBase
 
 

src/core/tasks/url/operators/auto_relevant/core.py

@@ -5,7 +5,7 @@
 from src.core.tasks.url.operators.auto_relevant.sort import separate_success_and_error_subsets
 from src.core.tasks.url.operators.base import URLTaskOperatorBase
 from src.db.client.async_ import AsyncDatabaseClient
-from src.db.models.impl.url.suggestion.relevant.auto.pydantic.input import AutoRelevancyAnnotationInput
+from src.db.models.impl.url.suggestion.url_type.auto.pydantic.input import AutoRelevancyAnnotationInput
 from src.db.enums import TaskType
 from src.db.models.impl.url.task_error.pydantic_.insert import URLTaskErrorPydantic
 from src.db.models.impl.url.task_error.pydantic_.small import URLTaskErrorSmall

src/core/tasks/url/operators/auto_relevant/queries/cte.py

@@ -6,7 +6,7 @@
 from src.db.helpers.query import not_exists_url, no_url_task_error
 from src.db.models.impl.url.core.sqlalchemy import URL
 from src.db.models.impl.url.html.compressed.sqlalchemy import URLCompressedHTML
-from src.db.models.impl.url.suggestion.relevant.auto.sqlalchemy import AutoRelevantSuggestion
+from src.db.models.impl.url.suggestion.url_type.auto.sqlalchemy import AutoRelevantSuggestion
 
 
 class AutoRelevantPrerequisitesCTEContainer: