Roll versions after J-Relase (master branch)

[nonrtric/plt/sme.git] / capifcore / internal / publishservice / publishservice.go

diff --git a/capifcore/internal/publishservice/publishservice.go b/capifcore/internal/publishservice/publishservice.go
index 670d2ed..a267acf 100644 (file)
--- a/capifcore/internal/publishservice/publishservice.go
+++ b/capifcore/internal/publishservice/publishservice.go
@@ -97,11 +97,11 @@ func (ps *PublishService) GetAllPublishedServices() []publishapi.ServiceAPIDescr
 
 func (ps *PublishService) GetAllowedPublishedServices(apiListRequestedServices []publishapi.ServiceAPIDescription) []publishapi.ServiceAPIDescription {
        apiListAllPublished := ps.GetAllPublishedServices()
-       allowedPublishedServices := intersection(apiListAllPublished, apiListRequestedServices)
+       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) {
@@ -110,7 +110,7 @@ func intersection(a, b []publishapi.ServiceAPIDescription) []publishapi.ServiceA
 
        for _, itemA := range a {
                for _, itemB := range b {
-                       if (itemA.ApiId != nil) && (itemB.ApiId != nil) && (*itemA.ApiId == *itemB.ApiId) {
+                       if itemA.ApiName == itemB.ApiName {
                                result = append(result, itemA)
                                break
                        }
@@ -121,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
 }
@@ -204,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()))
@@ -221,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)
                        }