wip: more compiler error fixes

GaloyMoney · Feb 19, 2025 · 044642c · 044642c
1 parent 1a77a21
commit 044642c
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 35 deletions.
diff --git a/core/credit/src/error.rs b/core/credit/src/error.rs
@@ -36,8 +36,6 @@ pub enum CreditFacilityError {
     DepositAccountForHolderNotFound(DepositAccountHolderId),
     #[error("CreditFacilityError - CoreDepositError: '{0}'")]
     CoreDepositError(#[from] crate::deposit::error::CoreDepositError),
-    #[error("CreditFacilityError - UserError: '{0}'")]
-    UserError(#[from] crate::user::error::UserError),
     #[error("CreditFacilityError - ApprovalInProgress")]
     ApprovalInProgress,
     #[error("CreditFacilityError - Denied")]

diff --git a/core/credit/src/for_subject.rs b/core/credit/src/for_subject.rs
@@ -1,23 +1,34 @@
 use audit::AuditSvc;
+use authz::PermissionCheck;
 use es_entity::{PaginatedQueryArgs, PaginatedQueryRet};
 
 use super::*;
 
-pub struct CreditFacilitiesForSubject<'a> {
+pub struct CreditFacilitiesForSubject<'a, Perms, E>
+where
+    Perms: PermissionCheck,
+    E: OutboxEventMarker<CoreCreditEvent>,
+{
     customer_id: CustomerId,
-    subject: &'a Subject,
-    authz: &'a Authorization,
-    credit_facilities: &'a CreditFacilityRepo,
+    subject: &'a <<Perms as PermissionCheck>::Audit as AuditSvc>::Subject,
+    authz: &'a Perms,
+    credit_facilities: &'a CreditFacilityRepo<E>,
     disbursals: &'a DisbursalRepo,
     payments: &'a PaymentRepo,
 }
 
-impl<'a> CreditFacilitiesForSubject<'a> {
+impl<'a, Perms, E> CreditFacilitiesForSubject<'a, Perms, E>
+where
+    Perms: PermissionCheck,
+    <<Perms as PermissionCheck>::Audit as AuditSvc>::Action: From<CoreCreditAction>,
+    <<Perms as PermissionCheck>::Audit as AuditSvc>::Object: From<CoreCreditObject>,
+    E: OutboxEventMarker<CoreCreditEvent>,
+{
     pub(super) fn new(
-        subject: &'a Subject,
+        subject: &'a <<Perms as PermissionCheck>::Audit as AuditSvc>::Subject,
         customer_id: CustomerId,
-        authz: &'a Authorization,
-        credit_facilities: &'a CreditFacilityRepo,
+        authz: &'a Perms,
+        credit_facilities: &'a CreditFacilityRepo<E>,
         disbursals: &'a DisbursalRepo,
         payments: &'a PaymentRepo,
     ) -> Self {
@@ -43,8 +54,8 @@ impl<'a> CreditFacilitiesForSubject<'a> {
             .audit()
             .record_entry(
                 self.subject,
-                Object::CreditFacility,
-                CreditFacilityAction::List,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
                 true,
             )
             .await?;
@@ -58,12 +69,13 @@ impl<'a> CreditFacilitiesForSubject<'a> {
         &self,
         id: impl Into<CreditFacilityId> + std::fmt::Debug,
     ) -> Result<CreditFacilityBalance, CreditFacilityError> {
-        let credit_facility = self.credit_facilities.find_by_id(id.into()).await?;
+        let id = id.into();
+        let credit_facility = self.credit_facilities.find_by_id(id).await?;
 
         self.ensure_credit_facility_access(
             &credit_facility,
-            Object::CreditFacility,
-            CreditFacilityAction::Read,
+            CoreCreditObject::credit_facility(id),
+            CoreCreditAction::CREDIT_FACILITY_READ,
         )
         .await?;
 
@@ -74,12 +86,13 @@ impl<'a> CreditFacilitiesForSubject<'a> {
         &self,
         id: impl Into<CreditFacilityId>,
     ) -> Result<Option<CreditFacility>, CreditFacilityError> {
-        match self.credit_facilities.find_by_id(id.into()).await {
+        let id = id.into();
+        match self.credit_facilities.find_by_id(id).await {
             Ok(cf) => {
                 self.ensure_credit_facility_access(
                     &cf,
-                    Object::CreditFacility,
-                    CreditFacilityAction::Read,
+                    CoreCreditObject::credit_facility(id.into()),
+                    CoreCreditAction::CREDIT_FACILITY_READ,
                 )
                 .await?;
                 Ok(Some(cf))
@@ -92,8 +105,8 @@ impl<'a> CreditFacilitiesForSubject<'a> {
     async fn ensure_credit_facility_access(
         &self,
         credit_facility: &CreditFacility,
-        object: Object,
-        action: CreditFacilityAction,
+        object: CoreCreditObject,
+        action: CoreCreditAction,
     ) -> Result<(), CreditFacilityError> {
         if credit_facility.customer_id != self.customer_id {
             self.authz
@@ -120,8 +133,8 @@ impl<'a> CreditFacilitiesForSubject<'a> {
         let credit_facility = self.credit_facilities.find_by_id(id).await?;
         self.ensure_credit_facility_access(
             &credit_facility,
-            Object::CreditFacility,
-            CreditFacilityAction::ListDisbursals,
+            CoreCreditObject::all_credit_facilities(),
+            CoreCreditAction::DISBURSAL_LIST,
         )
         .await?;
 
@@ -149,8 +162,8 @@ impl<'a> CreditFacilitiesForSubject<'a> {
             .await?;
         self.ensure_credit_facility_access(
             &credit_facility,
-            Object::CreditFacility,
-            CreditFacilityAction::Read,
+            CoreCreditObject::all_credit_facilities(),
+            CoreCreditAction::CREDIT_FACILITY_READ,
         )
         .await?;
 
@@ -169,8 +182,8 @@ impl<'a> CreditFacilitiesForSubject<'a> {
             .await?;
         self.ensure_credit_facility_access(
             &credit_facility,
-            Object::CreditFacility,
-            CreditFacilityAction::Read,
+            CoreCreditObject::all_credit_facilities(),
+            CoreCreditAction::CREDIT_FACILITY_READ,
         )
         .await?;
 

diff --git a/core/credit/src/lib.rs b/core/credit/src/lib.rs
@@ -226,7 +226,7 @@ where
     pub fn for_subject<'s>(
         &'s self,
         sub: &<<Perms as PermissionCheck>::Audit as AuditSvc>::Subject,
-    ) -> Result<CreditFacilitiesForSubject<'s>, CreditFacilityError> {
+    ) -> Result<CreditFacilitiesForSubject<'s, Perms, E>, CreditFacilityError> {
         let customer_id =
             CustomerId::try_from(sub).map_err(|_| CreditFacilityError::SubjectIsNotCustomer)?;
         Ok(CreditFacilitiesForSubject::new(
@@ -616,7 +616,11 @@ where
         CreditFacilityError,
     > {
         self.authz
-            .enforce_permission(sub, Object::CreditFacility, CreditFacilityAction::List)
+            .enforce_permission(
+                sub,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
+            )
             .await?;
         self.credit_facility_repo
             .find_many(filter, sort.into(), query)
@@ -639,7 +643,11 @@ where
         CreditFacilityError,
     > {
         self.authz
-            .enforce_permission(sub, Object::CreditFacility, CreditFacilityAction::List)
+            .enforce_permission(
+                sub,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
+            )
             .await?;
         self.credit_facility_repo
             .list_for_status_by_created_at(status, query, direction.into())
@@ -662,7 +670,11 @@ where
         CreditFacilityError,
     > {
         self.authz
-            .enforce_permission(sub, Object::CreditFacility, CreditFacilityAction::List)
+            .enforce_permission(
+                sub,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
+            )
             .await?;
         self.credit_facility_repo
             .list_for_collateralization_state_by_created_at(
@@ -691,7 +703,11 @@ where
         CreditFacilityError,
     > {
         self.authz
-            .enforce_permission(sub, Object::CreditFacility, CreditFacilityAction::List)
+            .enforce_permission(
+                sub,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
+            )
             .await?;
         self.credit_facility_repo
             .list_by_collateralization_ratio(query, direction.into())
@@ -717,7 +733,11 @@ where
         CreditFacilityError,
     > {
         self.authz
-            .enforce_permission(sub, Object::CreditFacility, CreditFacilityAction::List)
+            .enforce_permission(
+                sub,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
+            )
             .await?;
         self.credit_facility_repo
             .list_for_status_by_collateralization_ratio(status, query, direction.into())
@@ -743,7 +763,11 @@ where
         CreditFacilityError,
     > {
         self.authz
-            .enforce_permission(sub, Object::CreditFacility, CreditFacilityAction::List)
+            .enforce_permission(
+                sub,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_LIST,
+            )
             .await?;
         self.credit_facility_repo
             .list_for_collateralization_state_by_collateralization_ratio(
@@ -763,8 +787,8 @@ where
             .authz
             .evaluate_permission(
                 sub,
-                Object::CreditFacility,
-                CreditFacilityAction::Complete,
+                CoreCreditObject::all_credit_facilities(),
+                CoreCreditAction::CREDIT_FACILITY_COMPLETE,
                 enforce,
             )
             .await?)

diff --git a/core/credit/src/primitives.rs b/core/credit/src/primitives.rs
@@ -100,6 +100,8 @@ impl CoreCreditAction {
         CoreCreditAction::CreditFacility(CreditFacilityAction::RecordInterest);
     pub const CREDIT_FACILITY_COMPLETE: Self =
         CoreCreditAction::CreditFacility(CreditFacilityAction::Complete);
+    pub const CREDIT_FACILITY_UPDATE_COLLATERAL: Self =
+        CoreCreditAction::CreditFacility(CreditFacilityAction::UpdateCollateral);
     pub const CREDIT_FACILITY_UPDATE_COLLATERALIZATION_STATE: Self =
         CoreCreditAction::CreditFacility(CreditFacilityAction::UpdateCollateralizationState);
 
@@ -145,6 +147,7 @@ pub enum CreditFacilityAction {
     List,
     ConcludeApprovalProcess,
     Activate,
+    UpdateCollateral,
     RecordPayment,
     RecordInterest,
     Complete,