Consolidate UserTOSAgreement and TermsOfService resources

Author: gabino

cuenca/resources/terms_of_services.py

@@ -1,19 +1,18 @@
 import datetime as dt
 from typing import ClassVar
 
+from cuenca_validations.types import TermsOfService as TermsOfServiceEnum
 from cuenca_validations.types.general import SerializableHttpUrl
 
-from .base import Creatable, Queryable, Retrievable
+from .base import Queryable, Retrievable
 
 
-class TermsOfService(Creatable, Retrievable, Queryable):
+class TermsOfService(Retrievable, Queryable):
     _resource: ClassVar = 'terms_of_services'
 
     id: str
+    is_active: bool
     created_at: dt.datetime
-    user_id: str
-    tos_id: str
-    ip: str
-    location: str
-    hash: str
-    url: SerializableHttpUrl
+    type: TermsOfServiceEnum
+    version: str
+    uri: SerializableHttpUrl

cuenca/resources/terms_catalog.py cuenca/resources/user_tos_agreements.pycuenca/resources/terms_catalog.py renamed to cuenca/resources/user_tos_agreements.py

@@ -4,14 +4,18 @@
 from cuenca_validations.types import TermsOfService
 from cuenca_validations.types.general import SerializableHttpUrl
 
-from .base import Queryable, Retrievable
+from .base import Creatable, Queryable, Retrievable
 
 
-class TermsCatalog(Retrievable, Queryable):
-    _resource: ClassVar = 'terms_catalog'
+class UserTOSAgreement(Creatable, Retrievable, Queryable):
+    _resource: ClassVar = 'user_tos_agreements'
 
     id: str
     created_at: dt.datetime
+    user_id: str
     type: TermsOfService
     version: str
-    uri: SerializableHttpUrl
+    ip: str
+    location: str
+    hash: str
+    url: SerializableHttpUrl