fix & improvement

Author: matusdrobuliak66

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/licensed_items_checkouts.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from models_library.licenses import LicensedItemID
+from models_library.licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from models_library.products import ProductName
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
@@ -14,8 +14,8 @@
 class LicensedItemCheckoutDB(BaseModel):
     licensed_item_checkout_id: LicensedItemCheckoutID
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     user_id: UserID
     user_email: str
@@ -31,8 +31,8 @@ class LicensedItemCheckoutDB(BaseModel):
 
 class CreateLicensedItemCheckoutDB(BaseModel):
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     user_id: UserID
     user_email: str

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/models/licensed_items_purchases.py

@@ -2,7 +2,7 @@
 from decimal import Decimal
 
 from models_library.emails import LowerCaseEmailStr
-from models_library.licenses import LicensedItemID
+from models_library.licenses import LicensedItemID, LicensedItemKey, LicensedItemVersion
 from models_library.products import ProductName
 from models_library.resource_tracker import PricingUnitCostId
 from models_library.resource_tracker_licensed_items_purchases import (
@@ -17,8 +17,8 @@ class LicensedItemsPurchasesDB(BaseModel):
     licensed_item_purchase_id: LicensedItemPurchaseID
     product_name: ProductName
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     wallet_name: str
     pricing_unit_cost_id: PricingUnitCostId
@@ -37,8 +37,8 @@ class LicensedItemsPurchasesDB(BaseModel):
 class CreateLicensedItemsPurchasesDB(BaseModel):
     product_name: ProductName
     licensed_item_id: LicensedItemID
-    key: str
-    version: str
+    key: LicensedItemKey
+    version: LicensedItemVersion
     wallet_id: WalletID
     wallet_name: str
     pricing_unit_cost_id: PricingUnitCostId