X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fprovidermanagement%2Fprovidermanagement.go;h=51abd741b199a2f00e32b2d88b2d7cddfb949bf3;hb=refs%2Fchanges%2F61%2F12461%2F2;hp=6ca4a7c92b6b519fed6718c6c4bc40a0b6d1dfb8;hpb=f62685e5a2187fb58c7f27cdd1f14dd2c152880d;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/providermanagement/providermanagement.go b/capifcore/internal/providermanagement/providermanagement.go
index 6ca4a7c..51abd74 100644
--- a/capifcore/internal/providermanagement/providermanagement.go
+++ b/capifcore/internal/providermanagement/providermanagement.go
@@ -38,6 +38,7 @@ import (
 type ServiceRegister interface {
 	IsFunctionRegistered(functionId string) bool
 	GetAefsForPublisher(apfId string) []string
+	IsPublishingFunctionRegistered(apiProvFuncId string) bool
 }
 
 type ProviderManager struct {
@@ -69,6 +70,15 @@ func (pm *ProviderManager) GetAefsForPublisher(apfId string) []string {
 	return nil
 }
 
+func (pm *ProviderManager) IsPublishingFunctionRegistered(apiProvFuncId string) bool {
+	for _, provider := range pm.registeredProviders {
+		if provider.IsPublishingFunctionRegistered(apiProvFuncId) {
+			return true
+		}
+	}
+	return false
+}
+
 func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
 	var newProvider provapi.APIProviderEnrolmentDetails
 	errMsg := "Unable to register provider due to %s"
@@ -76,8 +86,8 @@ func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, "invalid format for provider"))
 	}
 
-	if pm.isProviderRegistered(newProvider) {
-		return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, "provider already registered"))
+	if err := pm.isProviderRegistered(newProvider); err != nil {
+		return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errMsg, err))
 	}
 
 	if err := newProvider.Validate(); err != nil {
@@ -95,13 +105,13 @@ func (pm *ProviderManager) PostRegistrations(ctx echo.Context) error {
 	return nil
 }
 
-func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails) bool {
+func (pm *ProviderManager) isProviderRegistered(newProvider provapi.APIProviderEnrolmentDetails) error {
 	for _, prov := range pm.registeredProviders {
-		if newProvider.RegSec == prov.RegSec {
-			return true
+		if err := prov.ValidateAlreadyRegistered(newProvider); err != nil {
+			return err
 		}
 	}
-	return false
+	return nil
 }
 
 func (pm *ProviderManager) prepareNewProvider(newProvider *provapi.APIProviderEnrolmentDetails) {
@@ -143,6 +153,12 @@ func (pm *ProviderManager) PutRegistrationsRegistrationId(ctx echo.Context, regi
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}
 
+	// Additional validation for PUT
+	if updatedProvider.ApiProvDomId == nil {
+		errDetail := "APIProviderEnrolmentDetails missing required ApiProvDomId"
+		return sendCoreError(ctx, http.StatusNotFound, fmt.Sprintf(errMsg, errDetail))
+	}
+
 	if err = pm.updateProvider(updatedProvider, registeredProvider); err != nil {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}