MPT-20504 consolidate resource mixins

mpt_api_client/resources/accounts/account.py

@@ -19,11 +19,10 @@
     AsyncAccountsUsersService,
 )
 from mpt_api_client.resources.accounts.mixins import (
-    ActivatableMixin,
-    AsyncActivatableMixin,
     AsyncValidateMixin,
     ValidateMixin,
 )
+from mpt_api_client.resources.mixins import ActivatableMixin, AsyncActivatableMixin
 
 
 class Account(Model):

mpt_api_client/resources/accounts/buyers.py

@@ -18,11 +18,10 @@
 from mpt_api_client.models import Model
 from mpt_api_client.models.model import ResourceData
 from mpt_api_client.resources.accounts.mixins import (
-    ActivatableMixin,
-    AsyncActivatableMixin,
     AsyncValidateMixin,
     ValidateMixin,
 )
+from mpt_api_client.resources.mixins import ActivatableMixin, AsyncActivatableMixin
 
 
 class Buyer(Model):

mpt_api_client/resources/accounts/mixins/__init__.py

@@ -1,7 +1,3 @@
-from mpt_api_client.resources.accounts.mixins.activatable_mixin import (
-    ActivatableMixin,
-    AsyncActivatableMixin,
-)
 from mpt_api_client.resources.accounts.mixins.blockable_mixin import (
     AsyncBlockableMixin,
     BlockableMixin,
@@ -16,8 +12,6 @@
 )
 
 __all__ = [  # noqa: WPS410
-    "ActivatableMixin",
-    "AsyncActivatableMixin",
     "AsyncBlockableMixin",
     "AsyncInvitableMixin",
     "AsyncValidateMixin",

mpt_api_client/resources/accounts/sellers.py

@@ -7,10 +7,7 @@
 )
 from mpt_api_client.models import Model
 from mpt_api_client.models.model import ResourceData
-from mpt_api_client.resources.accounts.mixins import (
-    ActivatableMixin,
-    AsyncActivatableMixin,
-)
+from mpt_api_client.resources.mixins import ActivatableMixin, AsyncActivatableMixin
 
 
 class Seller(Model):

mpt_api_client/resources/catalog/items.py

@@ -7,9 +7,11 @@
 )
 from mpt_api_client.models import Model
 from mpt_api_client.models.model import BaseModel
-from mpt_api_client.resources.catalog.mixins import (
+from mpt_api_client.resources.mixins import (
     AsyncPublishableMixin,
+    AsyncReviewableMixin,
     PublishableMixin,
+    ReviewableMixin,
 )
 
 
@@ -53,6 +55,7 @@ class ItemsServiceConfig:
 
 class ItemsService(
     PublishableMixin[Item],
+    ReviewableMixin[Item],
     ManagedResourceMixin[Item],
     CollectionMixin[Item],
     Service[Item],
@@ -63,6 +66,7 @@ class ItemsService(
 
 class AsyncItemsService(
     AsyncPublishableMixin[Item],
+    AsyncReviewableMixin[Item],
     AsyncManagedResourceMixin[Item],
     AsyncCollectionMixin[Item],
     AsyncService[Item],

mpt_api_client/resources/catalog/product_term_variants.py

@@ -11,9 +11,11 @@
 )
 from mpt_api_client.models import Model
 from mpt_api_client.models.model import BaseModel
-from mpt_api_client.resources.catalog.mixins import (
+from mpt_api_client.resources.mixins import (
     AsyncPublishableMixin,
+    AsyncReviewableMixin,
     PublishableMixin,
+    ReviewableMixin,
 )
 
 
@@ -64,6 +66,7 @@ class TermVariantService(
     DownloadFileMixin[TermVariant],
     ModifiableResourceMixin[TermVariant],
     PublishableMixin[TermVariant],
+    ReviewableMixin[TermVariant],
     CollectionMixin[TermVariant],
     Service[TermVariant],
     TermVariantServiceConfig,
@@ -76,6 +79,7 @@ class AsyncTermVariantService(
     AsyncDownloadFileMixin[TermVariant],
     AsyncModifiableResourceMixin[TermVariant],
     AsyncPublishableMixin[TermVariant],
+    AsyncReviewableMixin[TermVariant],
     AsyncCollectionMixin[TermVariant],
     AsyncService[TermVariant],
     TermVariantServiceConfig,

mpt_api_client/resources/catalog/product_terms.py

@@ -7,11 +7,16 @@
 )
 from mpt_api_client.models import Model
 from mpt_api_client.models.model import BaseModel
-from mpt_api_client.resources.catalog.mixins import AsyncPublishableMixin, PublishableMixin
 from mpt_api_client.resources.catalog.product_term_variants import (
     AsyncTermVariantService,
     TermVariantService,
 )
+from mpt_api_client.resources.mixins import (
+    AsyncPublishableMixin,
+    AsyncReviewableMixin,
+    PublishableMixin,
+    ReviewableMixin,
+)
 
 
 class Term(Model):
@@ -44,6 +49,7 @@ class TermServiceConfig:
 
 class TermService(
     PublishableMixin[Term],
+    ReviewableMixin[Term],
     ManagedResourceMixin[Term],
     CollectionMixin[Term],
     Service[Term],
@@ -61,6 +67,7 @@ def variants(self, term_id: str) -> TermVariantService:
 
 class AsyncTermService(
     AsyncPublishableMixin[Term],
+    AsyncReviewableMixin[Term],
     AsyncManagedResourceMixin[Term],
     AsyncCollectionMixin[Term],
     AsyncService[Term],

mpt_api_client/resources/catalog/products.py

@@ -13,14 +13,7 @@
 )
 from mpt_api_client.models import Model, ResourceData
 from mpt_api_client.models.model import BaseModel
-from mpt_api_client.resources.catalog.mixins import (
-    AsyncPublishableMixin,
-    PublishableMixin,
-)
-from mpt_api_client.resources.catalog.product_terms import (
-    AsyncTermService,
-    TermService,
-)
+from mpt_api_client.resources.catalog.product_terms import AsyncTermService, TermService
 from mpt_api_client.resources.catalog.products_documents import (
     AsyncDocumentService,
     DocumentService,
@@ -33,10 +26,7 @@
     AsyncProductItemService,
     ProductItemService,
 )
-from mpt_api_client.resources.catalog.products_media import (
-    AsyncMediaService,
-    MediaService,
-)
+from mpt_api_client.resources.catalog.products_media import AsyncMediaService, MediaService
 from mpt_api_client.resources.catalog.products_parameter_groups import (
     AsyncParameterGroupsService,
     ParameterGroupsService,
@@ -49,6 +39,12 @@
     AsyncTemplatesService,
     TemplatesService,
 )
+from mpt_api_client.resources.mixins import (
+    AsyncPublishableMixin,
+    AsyncReviewableMixin,
+    PublishableMixin,
+    ReviewableMixin,
+)
 
 
 class Product(Model):
@@ -95,6 +91,7 @@ class ProductsService(
     CreateFileMixin[Product],
     UpdateFileMixin[Product],
     PublishableMixin[Product],
+    ReviewableMixin[Product],
     GetMixin[Product],
     DeleteMixin,
     CollectionMixin[Product],
@@ -158,6 +155,7 @@ class AsyncProductsService(
     AsyncCreateFileMixin[Product],
     AsyncUpdateFileMixin[Product],
     AsyncPublishableMixin[Product],
+    AsyncReviewableMixin[Product],
     AsyncGetMixin[Product],
     AsyncDeleteMixin,
     AsyncCollectionMixin[Product],

mpt_api_client/resources/catalog/products_documents.py

@@ -7,9 +7,11 @@
 )
 from mpt_api_client.models import Model
 from mpt_api_client.models.model import BaseModel
-from mpt_api_client.resources.catalog.mixins import (
+from mpt_api_client.resources.mixins import (
     AsyncDocumentMixin,
+    AsyncReviewableMixin,
     DocumentMixin,
+    ReviewableMixin,
 )
 
 
@@ -55,6 +57,7 @@ class DocumentServiceConfig:
 
 class DocumentService(
     DocumentMixin[Document],
+    ReviewableMixin[Document],
     ModifiableResourceMixin[Document],
     CollectionMixin[Document],
     Service[Document],
@@ -65,6 +68,7 @@ class DocumentService(
 
 class AsyncDocumentService(
     AsyncDocumentMixin[Document],
+    AsyncReviewableMixin[Document],
     AsyncModifiableResourceMixin[Document],
     AsyncCollectionMixin[Document],
     AsyncService[Document],