fix(api): get, add and delete alarm works (#380)

Author: madhavilosetty-intel

go.mod

@@ -70,7 +70,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.2
+	github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.3
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect

go.sum

@@ -169,6 +169,8 @@ github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJm
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.2 h1:OkeCJ1CJQV/GDoT+3pa4046/uPAouqv7+d52ytUdDaU=
 github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.2/go.mod h1:LyY8fOvYBt5gawHYuivROR7EBySRuSR0u/k8QosnCeU=
+github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.3 h1:kg/WqyWJyp/28UR37Zm4/mBTh7X1oPo3oJPnMr48tZQ=
+github.com/open-amt-cloud-toolkit/go-wsman-messages/v2 v2.15.3/go.mod h1:LyY8fOvYBt5gawHYuivROR7EBySRuSR0u/k8QosnCeU=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=

internal/controller/http/v1/devicemanagement.go

@@ -161,11 +161,7 @@ func (r *deviceManagementRoutes) deleteAlarmOccurrences(c *gin.Context) {
 		return
 	}
 
-	if alarm.InstanceID == nil {
-		alarm.InstanceID = new(string)
-	}
-
-	err := r.d.DeleteAlarmOccurrences(c.Request.Context(), guid, *alarm.InstanceID)
+	err := r.d.DeleteAlarmOccurrences(c.Request.Context(), guid, alarm.Name)
 	if err != nil {
 		r.l.Error(err, "http - v1 - deleteAlarmOccurrences")
 		ErrorResponse(c, err)

internal/controller/http/v1/devicemanagement_test.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
-	"time"
 
 	"github.com/gin-gonic/gin"
 	power "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/cim/power"
@@ -39,8 +38,6 @@ func deviceManagementTest(t *testing.T) (*MockDeviceManagementFeature, *gin.Engi
 	return deviceManagement, engine
 }
 
-var aGoodTime = time.Unix(int64(1073007983), 0)
-
 func TestDeviceManagement(t *testing.T) {
 	t.Parallel()
 
@@ -102,15 +99,11 @@ func TestDeviceManagement(t *testing.T) {
 			name:   "deleteAlarmOccurrences - successful deletion",
 			url:    "/api/v1/amt/alarmOccurrences/valid-guid",
 			method: http.MethodDelete,
-			requestBody: dto.AlarmClockOccurrence{
-				ElementName:        "elementName",
-				StartTime:          aGoodTime,
-				Interval:           1,
-				DeleteOnCompletion: true,
-				InstanceID:         "1",
+			requestBody: dto.DeleteAlarmOccurrenceRequest{
+				Name: "instanceID",
 			},
 			mock: func(m *MockDeviceManagementFeature) {
-				m.EXPECT().DeleteAlarmOccurrences(context.Background(), "valid-guid", "1").Return(nil)
+				m.EXPECT().DeleteAlarmOccurrences(context.Background(), "valid-guid", "instanceID").Return(nil)
 			},
 			expectedCode: http.StatusNoContent,
 		},

internal/entity/dto/v1/alarm.go

@@ -4,14 +4,15 @@ import "time"
 
 type (
 	AlarmClockOccurrence struct {
-		ElementName        string    `json:"elementName" binding:"required" example:"test"`
-		InstanceID         string    `json:"instanceID" binding:"" example:"test"`
-		StartTime          time.Time `json:"startTime" binding:"required" example:"2024-01-01T00:00:00Z"`
-		Interval           int       `json:"interval" binding:"number" example:"1"`
-		DeleteOnCompletion bool      `json:"deleteOnCompletion" binding:"required" example:"true"`
+		ElementName        string    `json:"ElementName" binding:"required" example:"test"`
+		InstanceID         string    `json:"InstanceID" binding:"" example:"test"`
+		StartTime          time.Time `json:"StartTime" binding:"required" example:"2024-01-01T00:00:00Z"`
+		Interval           int       `json:"Interval" default:"0" example:"1"`
+		IntervalInMinutes  int       `json:"IntervalInMinutes" example:"1"`
+		DeleteOnCompletion bool      `json:"DeleteOnCompletion" binding:"" example:"true"`
 	}
 	DeleteAlarmOccurrenceRequest struct {
-		InstanceID *string `json:"instanceID" binding:"" example:"test"`
+		Name string `json:"Name" binding:"required" example:"test"`
 	}
 
 	AddAlarmOutput struct {

internal/usecase/devices/alarms.go

@@ -3,6 +3,7 @@ package devices
 import (
 	"context"
 	"strconv"
+	"strings"
 	"time"
 
 	amtAlarmClock "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/alarmclock"
@@ -11,6 +12,11 @@ import (
 	"github.com/open-amt-cloud-toolkit/console/internal/entity/dto/v1"
 )
 
+const (
+	minutesPerDay  = 24 * 60
+	minutesPerHour = 60
+)
+
 func (uc *UseCase) GetAlarmOccurrences(c context.Context, guid string) ([]dto.AlarmClockOccurrence, error) {
 	item, err := uc.GetByID(c, guid, "")
 	if err != nil {
@@ -33,7 +39,7 @@ func (uc *UseCase) GetAlarmOccurrences(c context.Context, guid string) ([]dto.Al
 
 	for i := range alarms {
 		tmpEntity := alarms[i] // create a new variable to avoid memory aliasing
-		d1[i] = *uc.alarmOccurenceEntityToDTO(&tmpEntity)
+		d1[i] = *uc.alarmOccurrenceEntityToDTO(&tmpEntity)
 	}
 
 	return d1, nil
@@ -83,16 +89,53 @@ func (uc *UseCase) addAlarmOutputEntityToDTO(d *amtAlarmClock.AddAlarmOutput) *d
 	return d1
 }
 
-func (uc *UseCase) alarmOccurenceEntityToDTO(d *alarmclock.AlarmClockOccurrence) *dto.AlarmClockOccurrence {
-	startTime, _ := time.Parse(time.RFC3339, d.StartTime)
-	interval, _ := strconv.Atoi(d.Interval)
+func (uc *UseCase) alarmOccurrenceEntityToDTO(d *alarmclock.AlarmClockOccurrence) *dto.AlarmClockOccurrence {
+	intervalInMinutes, _ := ParseInterval(d.Interval.Interval)
+	interval, _ := strconv.Atoi(d.Interval.Interval)
 	d1 := &dto.AlarmClockOccurrence{
 		ElementName:        d.ElementName,
 		InstanceID:         d.InstanceID,
-		StartTime:          startTime,
+		StartTime:          d.StartTime.Datetime,
 		Interval:           interval,
+		IntervalInMinutes:  intervalInMinutes,
 		DeleteOnCompletion: d.DeleteOnCompletion,
 	}
 
 	return d1
 }
+
+func ParseInterval(duration string) (int, error) {
+	if duration == "" {
+		return 0, nil
+	}
+
+	totalMinutes := 0
+
+	// parse days
+	duration = strings.TrimPrefix(duration, "P")
+	indexOfD := strings.Index(duration, "D")
+
+	if indexOfD != -1 {
+		days, err := strconv.Atoi(duration[:indexOfD])
+		if err != nil {
+			return 0, err
+		}
+
+		totalMinutes = days * minutesPerDay
+	}
+
+	// parse time
+	indexOfT := strings.Index(duration, "T")
+	if indexOfT != -1 {
+		duration = strings.ToLower(duration[indexOfT+1:])
+
+		timeDuration, err := time.ParseDuration(duration)
+		if err != nil {
+			return 0, err
+		}
+
+		return totalMinutes + int(timeDuration.Minutes()), nil
+	}
+
+	return totalMinutes, nil
+}

internal/usecase/devices/alarms_test.go

@@ -7,6 +7,7 @@ import (
 
 	amtAlarmClock "github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/amt/alarmclock"
 	"github.com/open-amt-cloud-toolkit/go-wsman-messages/v2/pkg/wsman/ips/alarmclock"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	gomock "go.uber.org/mock/gomock"
 
@@ -340,3 +341,37 @@ func TestDeleteAlarmOccurrences(t *testing.T) {
 		})
 	}
 }
+
+func TestParseInterval(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name     string
+		interval string
+		expected int
+		err      error
+	}{
+		{"Parse days only", "P2D", 2880, nil},
+		{"Parse hours only", "PT5H", 300, nil},
+		{"Parse minutes only", "PT30M", 30, nil},
+		{"Parse complex interval", "P1DT6H30M", 1830, nil},
+		{"Parse with seconds (ignored)", "P1DT6H30M45S", 1830, nil},
+		{"Empty string", "", 0, nil},
+	}
+
+	for _, tc := range tests {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			result, err := devices.ParseInterval(tc.interval)
+
+			if tc.err != nil {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tc.expected, result)
+			}
+		})
+	}
+}