X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fprovidermanagement%2Fprovidermanagement.go;h=ebdfa9a217e784236df0ee82b3f2a83fa3f24cf3;hb=b70522851289af2045d3d0c950b053b5673705cd;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..ebdfa9a 100644
--- a/capifcore/internal/providermanagement/providermanagement.go
+++ b/capifcore/internal/providermanagement/providermanagement.go
@@ -26,18 +26,18 @@ import (
 	"path"
 	"sync"
 
-	"github.com/labstack/echo/v4"
+	echo "github.com/labstack/echo/v4"
+	log "github.com/sirupsen/logrus"
 
 	"oransc.org/nonrtric/capifcore/internal/common29122"
 	provapi "oransc.org/nonrtric/capifcore/internal/providermanagementapi"
-
-	log "github.com/sirupsen/logrus"
 )
 
 //go:generate mockery --name ServiceRegister
 type ServiceRegister interface {
 	IsFunctionRegistered(functionId string) bool
 	GetAefsForPublisher(apfId string) []string
+	IsPublishingFunctionRegistered(apiProvFuncId string) bool
 }
 
 type ProviderManager struct {
@@ -69,6 +69,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 +85,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 +104,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 +152,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) || (*updatedProvider.ApiProvDomId != registrationId) {
+		errDetail := "APIProviderEnrolmentDetails ApiProvDomId doesn't match path parameter"
+		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, errDetail))
+	}
+
 	if err = pm.updateProvider(updatedProvider, registeredProvider); err != nil {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}