X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=capifcore%2Finternal%2Fpublishservice%2Fpublishservice.go;h=a267acfd242cabfd861bf33ac5aa31e043cd4da5;hb=HEAD;hp=372b1f8ff3a397099d1d73d9c47f05e64ffa2be4;hpb=b70522851289af2045d3d0c950b053b5673705cd;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/publishservice/publishservice.go b/capifcore/internal/publishservice/publishservice.go
index 372b1f8..a267acf 100644
--- a/capifcore/internal/publishservice/publishservice.go
+++ b/capifcore/internal/publishservice/publishservice.go
@@ -97,19 +97,20 @@ func (ps *PublishService) GetAllPublishedServices() []publishapi.ServiceAPIDescr
 
 func (ps *PublishService) GetAllowedPublishedServices(apiListRequestedServices []publishapi.ServiceAPIDescription) []publishapi.ServiceAPIDescription {
 	apiListAllPublished := ps.GetAllPublishedServices()
-	if apiListRequestedServices != nil {
-		allowedPublishedServices := intersection(apiListAllPublished, apiListRequestedServices)
-		return allowedPublishedServices
-	}
-	return []publishapi.ServiceAPIDescription{}
+	allowedPublishedServices := join(apiListAllPublished, apiListRequestedServices)
+	return allowedPublishedServices
 }
 
-func intersection(a, b []publishapi.ServiceAPIDescription) []publishapi.ServiceAPIDescription {
+func join(a, b []publishapi.ServiceAPIDescription) []publishapi.ServiceAPIDescription {
 	var result []publishapi.ServiceAPIDescription
 
+	if (a == nil) || (b == nil) || (len(a) == 0) || (len(b) == 0) {
+		return result
+	}
+
 	for _, itemA := range a {
 		for _, itemB := range b {
-			if *itemA.ApiId == *itemB.ApiId {
+			if itemA.ApiName == itemB.ApiName {
 				result = append(result, itemA)
 				break
 			}
@@ -120,16 +121,28 @@ func intersection(a, b []publishapi.ServiceAPIDescription) []publishapi.ServiceA
 
 // Retrieve all published APIs.
 func (ps *PublishService) GetApfIdServiceApis(ctx echo.Context, apfId string) error {
-	if !ps.serviceRegister.IsPublishingFunctionRegistered(apfId) {
-		errorMsg := fmt.Sprintf("Unable to get the service due to %s api is only available for publishers", apfId)
-		return sendCoreError(ctx, http.StatusNotFound, errorMsg)
-	}
+	ps.lock.Lock()
+	serviceDescriptions, ok := ps.publishedServices[apfId]
+	ps.lock.Unlock()
 
-	serviceDescriptions := ps.publishedServices[apfId]
-	err := ctx.JSON(http.StatusOK, serviceDescriptions)
-	if err != nil {
-		// Something really bad happened, tell Echo that our handler failed
-		return err
+	if ok {
+		err := ctx.JSON(http.StatusOK, serviceDescriptions)
+		if err != nil {
+			// Something really bad happened, tell Echo that our handler failed
+			return err
+		}
+	} else {
+		if !ps.serviceRegister.IsPublishingFunctionRegistered(apfId) {
+			errorMsg := fmt.Sprintf("Unable to get the service due to %s api is only available for publishers", apfId)
+			return sendCoreError(ctx, http.StatusNotFound, errorMsg)
+		}
+
+		serviceDescriptions = []publishapi.ServiceAPIDescription{}
+		err := ctx.JSON(http.StatusOK, serviceDescriptions)
+		if err != nil {
+			// Something really bad happened, tell Echo that our handler failed
+			return err
+		}
 	}
 	return nil
 }
@@ -203,7 +216,7 @@ func (ps *PublishService) isServicePublished(newService publishapi.ServiceAPIDes
 
 func (ps *PublishService) installHelmChart(newServiceAPIDescription publishapi.ServiceAPIDescription, ctx echo.Context) (bool, error) {
 	info := strings.Split(*newServiceAPIDescription.Description, ",")
-	if len(info) == 5 {
+	if (len(info) == 5) && (ps.helmManager != nil) {
 		err := ps.helmManager.InstallHelmChart(info[1], info[2], info[3], info[4])
 		if err != nil {
 			return true, sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf("Unable to install Helm chart %s due to: %s", info[3], err.Error()))
@@ -220,7 +233,7 @@ func (ps *PublishService) DeleteApfIdServiceApisServiceApiId(ctx echo.Context, a
 		pos, description := getServiceDescription(serviceApiId, serviceDescriptions)
 		if description != nil {
 			info := strings.Split(*description.Description, ",")
-			if len(info) == 5 {
+			if (len(info) == 5) && (ps.helmManager != nil) {
 				ps.helmManager.UninstallHelmChart(info[1], info[3])
 				log.Debug("Deleted service: ", serviceApiId)
 			}
@@ -283,7 +296,7 @@ func (ps *PublishService) PutApfIdServiceApisServiceApiId(ctx echo.Context, apfI
 	defer ps.lock.Unlock()
 	errMsg := "Unable to update service due to %s."
 
-	pos, publishedService, err := ps.checkIfServiceIsPublished(apfId, serviceApiId, ctx)
+	pos, publishedService, err := ps.checkIfServiceIsPublished(apfId, serviceApiId)
 	if err != nil {
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}
@@ -304,7 +317,7 @@ func (ps *PublishService) PutApfIdServiceApisServiceApiId(ctx echo.Context, apfI
 		return sendCoreError(ctx, http.StatusBadRequest, fmt.Sprintf(errMsg, err))
 	}
 
-	ps.updateDescription(pos, apfId, &updatedServiceDescription, &publishedService)
+	ps.updateDescription(&updatedServiceDescription, &publishedService)
 
 	publishedService.AefProfiles = updatedServiceDescription.AefProfiles
 	ps.publishedServices[apfId][pos] = publishedService
@@ -317,7 +330,7 @@ func (ps *PublishService) PutApfIdServiceApisServiceApiId(ctx echo.Context, apfI
 	return nil
 }
 
-func (ps *PublishService) checkIfServiceIsPublished(apfId string, serviceApiId string, ctx echo.Context) (int, publishapi.ServiceAPIDescription, error) {
+func (ps *PublishService) checkIfServiceIsPublished(apfId string, serviceApiId string) (int, publishapi.ServiceAPIDescription, error) {
 	publishedServices, ok := ps.publishedServices[apfId]
 	if !ok {
 		return 0, publishapi.ServiceAPIDescription{}, fmt.Errorf("service must be published before updating it")
@@ -340,7 +353,7 @@ func getServiceFromRequest(ctx echo.Context) (publishapi.ServiceAPIDescription,
 	return updatedServiceDescription, nil
 }
 
-func (ps *PublishService) updateDescription(pos int, apfId string, updatedServiceDescription, publishedService *publishapi.ServiceAPIDescription) {
+func (ps *PublishService) updateDescription(updatedServiceDescription, publishedService *publishapi.ServiceAPIDescription) {
 	if updatedServiceDescription.Description != nil {
 		publishedService.Description = updatedServiceDescription.Description
 		go ps.sendEvent(*publishedService, eventsapi.CAPIFEventSERVICEAPIUPDATE)