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
}
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))
}
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
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")
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)