Merge pull request #317

MPT-20504 consolidate resource mixins

Author: jentyk

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/mixins/activatable_mixin.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,