X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fpublishservice%2Fpublishservice.go;h=7960f12acbec4a078b618a89ffb325b7c3d5bfbf;hb=bf237808ac109b30461a453c59ff4e9cc9b297f4;hp=5cea538f1f59f76dcbefa8aad33571fea1f0b0dc;hpb=c3cc44190afd4793d76f3cc5814b8b5e79267fb3;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/publishservice/publishservice.go b/capifcore/internal/publishservice/publishservice.go
index 5cea538..7960f12 100644
--- a/capifcore/internal/publishservice/publishservice.go
+++ b/capifcore/internal/publishservice/publishservice.go
@@ -42,9 +42,6 @@ import (
 
 //go:generate mockery --name PublishRegister
 type PublishRegister interface {
-	// Checks if the provided APIs are published.
-	// Returns true if all provided APIs have been published, false otherwise.
-	AreAPIsPublished(serviceDescriptions *[]publishapi.ServiceAPIDescription) bool
 	// Checks if the provided API is published.
 	// Returns true if the provided API has been published, false otherwise.
 	IsAPIPublished(aefId, path string) bool
@@ -71,15 +68,6 @@ func NewPublishService(serviceRegister providermanagement.ServiceRegister, hm he
 	}
 }
 
-func (ps *PublishService) AreAPIsPublished(serviceDescriptions *[]publishapi.ServiceAPIDescription) bool {
-
-	if serviceDescriptions != nil {
-		registeredApis := ps.getAllAefIds()
-		return checkNewDescriptions(*serviceDescriptions, registeredApis)
-	}
-	return true
-}
-
 func (ps *PublishService) getAllAefIds() []string {
 	ps.lock.Lock()
 	defer ps.lock.Unlock()
@@ -87,46 +75,12 @@ func (ps *PublishService) getAllAefIds() []string {
 	allIds := []string{}
 	for _, descriptions := range ps.publishedServices {
 		for _, description := range descriptions {
-			allIds = append(allIds, getIdsFromDescription(description)...)
+			allIds = append(allIds, description.GetAefIds()...)
 		}
 	}
 	return allIds
 }
 
-func getIdsFromDescription(description publishapi.ServiceAPIDescription) []string {
-	allIds := []string{}
-	if description.AefProfiles != nil {
-		for _, aefProfile := range *description.AefProfiles {
-			allIds = append(allIds, aefProfile.AefId)
-		}
-	}
-	return allIds
-}
-
-func checkNewDescriptions(newDescriptions []publishapi.ServiceAPIDescription, registeredAefIds []string) bool {
-	registered := true
-	for _, newApi := range newDescriptions {
-		if !checkProfiles(newApi.AefProfiles, registeredAefIds) {
-			registered = false
-			break
-		}
-	}
-	return registered
-}
-
-func checkProfiles(newProfiles *[]publishapi.AefProfile, registeredAefIds []string) bool {
-	allRegistered := true
-	if newProfiles != nil {
-		for _, profile := range *newProfiles {
-			if !slices.Contains(registeredAefIds, profile.AefId) {
-				allRegistered = false
-				break
-			}
-		}
-	}
-	return allRegistered
-}
-
 func (ps *PublishService) IsAPIPublished(aefId, path string) bool {
 	return slices.Contains(ps.getAllAefIds(), aefId)
 }
@@ -164,8 +118,8 @@ func (ps *PublishService) PostApfIdServiceApis(ctx echo.Context, apfId string) e
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errorMsg, "invalid format for service "+apfId))
 	}
 
-	if ps.isServicePublished(newServiceAPIDescription) {
-		return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errorMsg, "service already published"))
+	if err := ps.isServicePublished(newServiceAPIDescription); err != nil {
+		return sendCoreError(ctx, http.StatusForbidden, fmt.Sprintf(errorMsg, err))
 	}
 
 	if err := newServiceAPIDescription.Validate(); err != nil {
@@ -181,8 +135,7 @@ func (ps *PublishService) PostApfIdServiceApis(ctx echo.Context, apfId string) e
 		}
 	}
 
-	newId := "api_id_" + newServiceAPIDescription.ApiName
-	newServiceAPIDescription.ApiId = &newId
+	newServiceAPIDescription.PrepareNewService()
 
 	shouldReturn, returnValue := ps.installHelmChart(newServiceAPIDescription, ctx)
 	if shouldReturn {
@@ -208,15 +161,15 @@ func (ps *PublishService) PostApfIdServiceApis(ctx echo.Context, apfId string) e
 	return nil
 }
 
-func (ps *PublishService) isServicePublished(newService publishapi.ServiceAPIDescription) bool {
+func (ps *PublishService) isServicePublished(newService publishapi.ServiceAPIDescription) error {
 	for _, services := range ps.publishedServices {
 		for _, service := range services {
-			if newService.ApiName == service.ApiName {
-				return true
+			if err := service.ValidateAlreadyPublished(newService); err != nil {
+				return err
 			}
 		}
 	}
-	return false
+	return nil
 }
 
 func (ps *PublishService) installHelmChart(newServiceAPIDescription publishapi.ServiceAPIDescription, ctx echo.Context) (bool, error) {
@@ -307,11 +260,11 @@ func (ps *PublishService) PutApfIdServiceApisServiceApiId(ctx echo.Context, apfI
 	if err != nil {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}
-	ps.updateDescription(pos, apfId, &updatedServiceDescription, &publishedService)
 	err = ps.checkProfilesRegistered(apfId, *updatedServiceDescription.AefProfiles)
 	if err != nil {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}
+	ps.updateDescription(pos, apfId, &updatedServiceDescription, &publishedService)
 	publishedService.AefProfiles = updatedServiceDescription.AefProfiles
 	ps.publishedServices[apfId][pos] = publishedService
 	err = ctx.JSON(http.StatusOK, publishedService)