Replace partyId with partyUuid for systemuser

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/ClientInterfaces/ISystemUserAgentDelegationClient.cs

@@ -12,11 +12,10 @@ public interface ISystemUserAgentDelegationClient
         /// Return delegated customers for this system user
         /// </summary>
         /// <param name="partyId">The party id of the party owning system user to retrieve delegated customers from</param>
-        /// <param name="facilitatorId">Facilitator uuid, uuid of partyId</param>
         /// <param name="systemUserGuid">The system user UUID to retrieve delegated customers from</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>List of delegated customers for system user</returns>
-        Task<List<AgentDelegation>> GetSystemUserAgentDelegations(int partyId, Guid facilitatorId, Guid systemUserGuid, CancellationToken cancellationToken);
+        Task<List<AgentDelegation>> GetSystemUserAgentDelegations(Guid partyId, Guid systemUserGuid, CancellationToken cancellationToken);
 
         /// <summary>
         /// Add client to system user
@@ -26,16 +25,15 @@ public interface ISystemUserAgentDelegationClient
         /// <param name="delegationRequest">The party uuid of the customer to add + partyUuid of system user owner party</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>List of AgentDelegation objects with delegation info</returns>
-        Task<Result<List<AgentDelegation>>> AddClient(int partyId, Guid systemUserGuid, AgentDelegationRequest delegationRequest, CancellationToken cancellationToken);
+        Task<Result<List<AgentDelegation>>> AddClient(Guid partyId, Guid systemUserGuid, AgentDelegationRequest delegationRequest, CancellationToken cancellationToken);
 
         /// <summary>
         /// Remove client from system user
         /// </summary>
         /// <param name="partyId">The party id of the party owning system user to remove customer from</param>
-        /// <param name="facilitatorId">Facilitator uuid, uuid of partyId</param>
         /// <param name="delegationId">The delegation id to remove</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean result of remove</returns>
-        Task<Result<bool>> RemoveClient(int partyId, Guid facilitatorId, Guid delegationId, CancellationToken cancellationToken);
+        Task<Result<bool>> RemoveClient(Guid partyId, Guid delegationId, CancellationToken cancellationToken);
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/ClientInterfaces/ISystemUserAgentRequestClient.cs

@@ -15,7 +15,7 @@ public interface ISystemUserAgentRequestClient
         /// <param name="agentRequestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>The system user request</returns>
-        Task<Result<SystemUserAgentRequest>> GetSystemUserAgentRequest(int partyId, Guid agentRequestId, CancellationToken cancellationToken);
+        Task<Result<SystemUserAgentRequest>> GetSystemUserAgentRequest(Guid partyId, Guid agentRequestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Approve a system user agent delegation request to create a new system user
@@ -24,7 +24,7 @@ public interface ISystemUserAgentRequestClient
         /// <param name="agentRequestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the create system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> ApproveSystemUserAgentRequest(int partyId, Guid agentRequestId, CancellationToken cancellationToken);
+        Task<Result<bool>> ApproveSystemUserAgentRequest(Guid partyId, Guid agentRequestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Reject a system user agent delegation request
@@ -33,6 +33,6 @@ public interface ISystemUserAgentRequestClient
         /// <param name="agentRequestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the rejest system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> RejectSystemUserAgentRequest(int partyId, Guid agentRequestId, CancellationToken cancellationToken);
+        Task<Result<bool>> RejectSystemUserAgentRequest(Guid partyId, Guid agentRequestId, CancellationToken cancellationToken);
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/ClientInterfaces/ISystemUserChangeRequestClient.cs

@@ -15,7 +15,7 @@ public interface ISystemUserChangeRequestClient
         /// <param name="changeRequestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>The system user request</returns>
-        Task<Result<SystemUserChangeRequest>> GetSystemUserChangeRequest(int partyId, Guid changeRequestId, CancellationToken cancellationToken);
+        Task<Result<SystemUserChangeRequest>> GetSystemUserChangeRequest(Guid partyId, Guid changeRequestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Approve a system user change request to create a new system user
@@ -24,7 +24,7 @@ public interface ISystemUserChangeRequestClient
         /// <param name="changeRequestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the create system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> ApproveSystemUserChangeRequest(int partyId, Guid changeRequestId, CancellationToken cancellationToken);
+        Task<Result<bool>> ApproveSystemUserChangeRequest(Guid partyId, Guid changeRequestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Reject a system user change request
@@ -33,6 +33,6 @@ public interface ISystemUserChangeRequestClient
         /// <param name="changeRequestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the rejest system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> RejectSystemUserChangeRequest(int partyId, Guid changeRequestId, CancellationToken cancellationToken);
+        Task<Result<bool>> RejectSystemUserChangeRequest(Guid partyId, Guid changeRequestId, CancellationToken cancellationToken);
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/ClientInterfaces/ISystemUserClient.cs

@@ -15,7 +15,7 @@ public interface ISystemUserClient
         /// <param name="id">Id of system user to get</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Requested system user</returns>
-        Task<SystemUser> GetSpecificSystemUser(int partyId, Guid id, CancellationToken cancellationToken);
+        Task<SystemUser> GetSpecificSystemUser(Guid partyId, Guid id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Create a new system user
@@ -24,7 +24,7 @@ public interface ISystemUserClient
         /// <param name="newSystemUser">Object with IntegrationTitle and SystemId for new system user</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Id of created system user, or specific error if creation fails</returns>
-        Task<Result<SystemUser>> CreateNewSystemUser(int partyId, NewSystemUserRequest newSystemUser, CancellationToken cancellationToken);
+        Task<Result<SystemUser>> CreateNewSystemUser(Guid partyId, NewSystemUserRequest newSystemUser, CancellationToken cancellationToken);
 
         /// <summary>
         /// Deletes system user
@@ -33,15 +33,15 @@ public interface ISystemUserClient
         /// <param name="id">Id of system user to delete</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean whether delete was successful or not</returns>
-        Task<bool> DeleteSystemUser(int partyId, Guid id, CancellationToken cancellationToken);
+        Task<bool> DeleteSystemUser(Guid partyId, Guid id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Return all system users created for a given party
         /// </summary>
         /// <param name="partyId">The party Id of the party to retrieve</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>List of all system users for specified party</returns>
-        Task<List<SystemUser>> GetSystemUsersForParty(int partyId, CancellationToken cancellationToken);
+        Task<List<SystemUser>> GetSystemUsersForParty(Guid partyId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Return a specific agent system user
@@ -50,24 +50,23 @@ public interface ISystemUserClient
         /// <param name="id">Id of system user to get</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Requested agent system user</returns>
-        Task<SystemUser> GetAgentSystemUser(int partyId, Guid id, CancellationToken cancellationToken);
+        Task<SystemUser> GetAgentSystemUser(Guid partyId, Guid id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Return all agent system users created for a given party
         /// </summary>
         /// <param name="partyId">The party Id of the party to retrieve</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>List of all agent system users for specified party</returns>
-        Task<List<SystemUser>> GetAgentSystemUsersForParty(int partyId, CancellationToken cancellationToken);
+        Task<List<SystemUser>> GetAgentSystemUsersForParty(Guid partyId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Deletes agent system user
         /// </summary>
         /// <param name="partyId">The party Id of the party to retrieve</param>
         /// <param name="systemUserId">Id of system user to delete</param>
-        /// <param name="facilitatorId">Id of facilitator owning systemuser</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean whether delete was successful or not</returns>
-        Task<Result<bool>> DeleteAgentSystemUser(int partyId, Guid systemUserId, Guid facilitatorId, CancellationToken cancellationToken);
+        Task<Result<bool>> DeleteAgentSystemUser(Guid partyId, Guid systemUserId, CancellationToken cancellationToken);
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/ClientInterfaces/ISystemUserRequestClient.cs

@@ -15,7 +15,7 @@ public interface ISystemUserRequestClient
         /// <param name="requestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>The system user request</returns>
-        Task<Result<SystemUserRequest>> GetSystemUserRequest(int partyId, Guid requestId, CancellationToken cancellationToken);
+        Task<Result<SystemUserRequest>> GetSystemUserRequest(Guid partyId, Guid requestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Approve a system user request to create a new system user
@@ -24,7 +24,7 @@ public interface ISystemUserRequestClient
         /// <param name="requestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the create system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> ApproveSystemUserRequest(int partyId, Guid requestId, CancellationToken cancellationToken);
+        Task<Result<bool>> ApproveSystemUserRequest(Guid partyId, Guid requestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Reject a system user request
@@ -33,6 +33,6 @@ public interface ISystemUserRequestClient
         /// <param name="requestId">The id of the system user request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the rejest system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> RejectSystemUserRequest(int partyId, Guid requestId, CancellationToken cancellationToken);
+        Task<Result<bool>> RejectSystemUserRequest(Guid partyId, Guid requestId, CancellationToken cancellationToken);
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/Models/SystemUser/AgentDelegationRequest.cs

@@ -9,10 +9,5 @@ public class AgentDelegationRequest
         /// The party uuid to add
         /// </summary>
         public Guid CustomerId { get; set; }
-
-        /// <summary>
-        /// PartyUuid of party which owns the agent system user
-        /// </summary>
-        public Guid FacilitatorId { get; set; }
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/Services/Interfaces/ISystemUserAgentDelegationService.cs

@@ -14,40 +14,36 @@ public interface ISystemUserAgentDelegationService
         /// </summary>
         /// <param name="partyId">The party id of the party owning system user</param>
         /// <param name="systemUserGuid">The system user UUID to get customers from</param>
-        /// <param name="partyUuid">The party uuid of the party owning system user</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>List of all systemuser customers</returns>
-        Task<Result<List<CustomerPartyFE>>> GetSystemUserCustomers(int partyId, Guid systemUserGuid, Guid partyUuid, CancellationToken cancellationToken);
+        Task<Result<List<CustomerPartyFE>>> GetSystemUserCustomers(Guid partyId, Guid systemUserGuid, CancellationToken cancellationToken);
 
         /// <summary>
         /// Return delegated customers for this system user
         /// </summary>
         /// <param name="partyId">The party id of the party owning system user to retrieve delegated customers from</param>
         /// <param name="systemUserGuid">The system user UUID to retrieve delegated customers from</param>
-        /// <param name="partyUuid">The party UUID of the party owning system user to retrieve delegated customers from</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>List of delegated customers for system user</returns>
-        Task<Result<List<AgentDelegationFE>>> GetSystemUserAgentDelegations(int partyId, Guid systemUserGuid, Guid partyUuid, CancellationToken cancellationToken);
+        Task<Result<List<AgentDelegationFE>>> GetSystemUserAgentDelegations(Guid partyId, Guid systemUserGuid, CancellationToken cancellationToken);
 
         /// <summary>
         /// Add client to system user
         /// </summary>
         /// <param name="partyId">The party id of the party owning system user to add customer to</param>
         /// <param name="systemUserGuid">The system user UUID to add customer to</param>
-        /// <param name="partyUuid">The party uuid of the party owning system user to add customer to</param>
         /// <param name="delegationRequestFe">Payload to send to add client</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>AgentDelegationFE with assignment id and customer id</returns>
-        Task<Result<AgentDelegationFE>> AddClient(int partyId, Guid systemUserGuid, Guid partyUuid, AgentDelegationRequestFE delegationRequestFe, CancellationToken cancellationToken);
+        Task<Result<AgentDelegationFE>> AddClient(Guid partyId, Guid systemUserGuid, AgentDelegationRequestFE delegationRequestFe, CancellationToken cancellationToken);
 
         /// <summary>
         /// Remove client from system user
         /// </summary>
         /// <param name="partyId">The party id of the party owning system user to remove customer from</param>
         /// <param name="delegationId">The delegation id to remove</param>
-        /// <param name="partyUuid">The party uuid of the party owning system user to remove customer from</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean result of remove</returns>
-        Task<Result<bool>> RemoveClient(int partyId, Guid delegationId, Guid partyUuid, CancellationToken cancellationToken);
+        Task<Result<bool>> RemoveClient(Guid partyId, Guid delegationId, CancellationToken cancellationToken);
     }
 }

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI.Core/Services/Interfaces/ISystemUserAgentRequestService.cs

@@ -16,7 +16,7 @@ public interface ISystemUserAgentRequestService
         /// <param name="languageCode">Language code. Can be either nb, nn or en</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>The system user request</returns>
-        Task<Result<SystemUserAgentRequestFE>> GetSystemUserAgentRequest(int partyId, Guid agentRequestId, string languageCode, CancellationToken cancellationToken);
+        Task<Result<SystemUserAgentRequestFE>> GetSystemUserAgentRequest(Guid partyId, Guid agentRequestId, string languageCode, CancellationToken cancellationToken);
 
         /// <summary>
         /// Approve an agent delegation user request to create a new system user
@@ -25,7 +25,7 @@ public interface ISystemUserAgentRequestService
         /// <param name="agentRequestId">The id of the system user agent request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the create system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> ApproveSystemUserAgentRequest(int partyId, Guid agentRequestId, CancellationToken cancellationToken);
+        Task<Result<bool>> ApproveSystemUserAgentRequest(Guid partyId, Guid agentRequestId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Reject an agent delegation system user request
@@ -34,6 +34,6 @@ public interface ISystemUserAgentRequestService
         /// <param name="agentRequestId">The id of the system user agent request</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns>Boolean, result of the reject system user operation, or a ProblemDetails result with error</returns>
-        Task<Result<bool>> RejectSystemUserAgentRequest(int partyId, Guid agentRequestId, CancellationToken cancellationToken);
+        Task<Result<bool>> RejectSystemUserAgentRequest(Guid partyId, Guid agentRequestId, CancellationToken cancellationToken);
     }
 }