[ID-62]Fix webtools blacklist APIs

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Fix webtools blacklist APIs [#62](https://github.com/rokwire/gateway-building-block/issues/62)
+
 [2.4.0] - 2024-03-29
 ### Added
 - Ability to block/blacklist specific Webtools events [#57](https://github.com/rokwire/gateway-building-block/issues/57)

driven/storage/adapter.go

@@ -401,28 +401,32 @@ func (a *Adapter) AddWebtoolsBlacklistData(dataSourceIDs []string, dataCalendarI
 
 // RemoveWebtoolsBlacklistData update data from the database
 func (a *Adapter) RemoveWebtoolsBlacklistData(dataSourceIDs []string, dataCalendarIDs []string) error {
-	filterSource := bson.M{"name": "webtools_events_ids"}
-	updateSource := bson.M{
-		"$pull": bson.M{
-			"data": bson.M{"$in": dataSourceIDs},
-		},
-	}
+	if dataSourceIDs != nil {
+		filterSource := bson.M{"name": "webtools_events_ids"}
+		updateSource := bson.M{
+			"$pull": bson.M{
+				"data": bson.M{"$in": dataSourceIDs},
+			},
+		}
 
-	_, err := a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterSource, updateSource, nil)
-	if err != nil {
-		return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeExample, filterArgs(filterSource), err)
+		_, err := a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterSource, updateSource, nil)
+		if err != nil {
+			return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeExample, filterArgs(filterSource), err)
+		}
 	}
+	if dataCalendarIDs != nil {
+		filterCalendar := bson.M{"name": "webtools_calendar_ids"}
+		updateCalendar := bson.M{
+			"$pull": bson.M{
+				"data": bson.M{"$in": dataCalendarIDs},
+			},
+		}
 
-	filterCalendar := bson.M{"name": "webtools_calendar_ids"}
-	updateCalendar := bson.M{
-		"$pull": bson.M{
-			"data": bson.M{"$in": dataCalendarIDs},
-		},
-	}
+		_, err := a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterCalendar, updateCalendar, nil)
+		if err != nil {
+			return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeExample, filterArgs(filterCalendar), err)
+		}
 
-	_, err = a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterCalendar, updateCalendar, nil)
-	if err != nil {
-		return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeExample, filterArgs(filterCalendar), err)
 	}
 
 	return nil

driver/web/apis_admin.go

@@ -245,20 +245,20 @@ func (h AdminAPIsHandler) addwebtoolsblacklist(l *logs.Log, r *http.Request, cla
 	}
 
 	var dataSourceIDs []string
-	for _, w := range *requestData.DataSourceIds {
-		if w != "" {
-			dataSourceIDs = append(dataSourceIDs, w)
-		} else {
-			dataSourceIDs = nil
+	if requestData.DataSourceIds != nil {
+		for _, w := range *requestData.DataSourceIds {
+			if w != "" {
+				dataSourceIDs = append(dataSourceIDs, w)
+			}
 		}
 	}
 
 	var dataCalendarIDs []string
-	for _, w := range *requestData.DataCalendarIds {
-		if w != "" {
-			dataCalendarIDs = append(dataCalendarIDs, w)
-		} else {
-			dataCalendarIDs = nil
+	if requestData.DataCalendarIds != nil {
+		for _, w := range *requestData.DataCalendarIds {
+			if w != "" {
+				dataCalendarIDs = append(dataCalendarIDs, w)
+			}
 		}
 	}
 

driver/web/docs/gen/def.yaml

@@ -475,10 +475,12 @@ paths:
               properties:
                 data_source_ids:
                   type: array
+                  nullable: true
                   items:
                     type: string
                 data_calendar_ids:
                   type: array
+                  nullable: true
                   items:
                     type: string
       responses:

driver/web/docs/schemas/apis/admin/add-webtools-blacklist/Request.yaml

@@ -2,10 +2,12 @@ type: object
 properties:
   data_source_ids:
     type: array
+    nullable: true
     items:
       type: string
   data_calendar_ids:
     type: array
+    nullable: true
     items:
       type: string