added field requested_asset to Registered_tenants struct in pallet te…

…nancy

pallets/tenancy/src/lib.rs

@@ -173,13 +173,25 @@ pub mod pallet {
 			let caller = ensure_signed(origin.clone())?;
 			// Ensure that the caller has the tenancy role
 			ensure!(Roles::TenantLog::<T>::contains_key(caller.clone()), Error::<T>::NotATenant);
-			RegisteredTenant::<T>::new(caller.clone(), info.clone()).ok();
+
+
 
 			// Ensure that the asset is valid
 			let collection_id: T::NftCollectionId = asset_type.value().into();
 			let ownership = Share::Pallet::<T>::virtual_acc(collection_id, asset_id);
 			ensure!(ownership.is_some(), Error::<T>::NotAnAsset);
 			let virtual_account = ownership.unwrap().virtual_account;
+
+			if !Tenants::<T>::contains_key(caller.clone()){
+				RegisteredTenant::<T>::new(caller.clone(), info.clone(), Some(virtual_account.clone())).ok();
+			}else{
+				let mut val0 = Self::infos(&caller).unwrap();
+				Tenants::<T>::mutate(&caller,|val|{
+					val0.asset_requested = Some(virtual_account.clone());
+					*val = Some(val0);
+				}); 
+			}
+
 			Self::request_helper(origin.clone(), virtual_account.clone(), info).ok();
 			let now = <frame_system::Pallet<T>>::block_number();
 
@@ -225,9 +237,12 @@ pub mod pallet {
 				Error::<T>::NotAValidPayment
 			);
 
+
 			Self::payment_helper(origin, virtual_account.clone(), collection_id, asset_id).ok();
 			let now = <frame_system::Pallet<T>>::block_number();
 
+
+
 			Self::deposit_event(Event::GuarantyDepositPayment {
 				tenant: caller,
 				when: now,

pallets/tenancy/src/types.rs

@@ -34,15 +34,19 @@ pub struct RegisteredTenant<T: Config> {
 	pub infos: Box<IdentityInfo<T::MaxAdditionalFields>>,
 	///Creation Blocknumber
 	pub registered_at_block: BlockNumberOf<T>,
+	///Asset requested by the tenant
+	pub asset_requested: Option<T::AccountId>,
 }
 
 impl<T: Config> RegisteredTenant<T> {
 	pub fn new(
 		tenant_id: T::AccountId,
 		infos: Box<IdentityInfo<T::MaxAdditionalFields>>,
+		asset_requested: Option<T::AccountId>,
+
 	) -> DispatchResult {
 		let registered_at_block = <frame_system::Pallet<T>>::block_number();
-		let tenant = RegisteredTenant::<T> { infos, registered_at_block };
+		let tenant = RegisteredTenant::<T> { infos, registered_at_block,asset_requested};
 		Tenants::<T>::insert(tenant_id.clone(), tenant);
 		Roles::TenantLog::<T>::mutate(tenant_id, |val| {
 			let mut val0 = val.clone().unwrap();