fix: unmarshalling number to FileSize

Author: parMaster

client/client.go

@@ -157,7 +157,7 @@ func (z *ZoomClient) GetIntervalMeetings(ctx context.Context, from, to time.Time
 		recordings := &model.Recordings{}
 
 		if err := json.NewDecoder(resp.Body).Decode(recordings); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to unmarshal recordings: %w", err)
 		}
 
 		meetings = append(meetings, recordings.Meetings...)
@@ -211,7 +211,7 @@ func (z *ZoomClient) GetAllMeetingsWithRetry(ctx context.Context) ([]model.Meeti
 	var meetings []model.Meeting
 	var err error
 
-	for i := 0; i < 10; i++ {
+	for i := range 10 {
 		meetings, err = z.GetAllMeetings(ctx)
 		if err != nil {
 			delay := 30 * time.Duration(i) * time.Second

client/client_test.go

@@ -51,12 +51,12 @@ func Test_ZoomClient(t *testing.T) {
 	assert.Equal(t, len(meetings), len(meetingsInterval))
 
 	// DeleteRecordingsOverCapacity test
-	storageCapacity := model.FileSize(500 * 1024 * 1024 * 1024) // 500GB
+	storageCapacity := model.FileSize(1000 * 1024 * 1024 * 1024) // 1 TB
 	deleted, err := c.DeleteRecordingsOverCapacity(context.Background(), storageCapacity)
 	assert.NoError(t, err)
 	assert.NotNil(t, deleted)
 
-	// Get cloud storage
+	// GetCloudStorageReport
 	// from the day before yesterday to yesterday
 	from := time.Now().AddDate(0, 0, -2).Format("2006-01-02")
 	to := time.Now().Format("2006-01-02")
@@ -66,7 +66,7 @@ func Test_ZoomClient(t *testing.T) {
 	assert.NotNil(t, storageReport)
 	log.Printf("[DEBUG] Storage report: %+v", storageReport)
 
-	// Get token error condition
+	// GetToken error condition
 	cfg.Client.Secret = "error"
 	c = NewZoomClient(cfg.Client)
 	assert.NotNil(t, c)

storage/model/models.go

@@ -118,31 +118,38 @@ func (f FileSize) MarshalJSON() ([]byte, error) {
 	return fmt.Appendf(nil, `"%s"`, f.String()), nil
 }
 
-// UnmarshalJSON implements the json.Unmarshaler interface for FileSize
+// UnmarshalJSON implements the json.Unmarshaler interface for FileSize.
+// It can parse either number (nn) or string (nn KB, nn MB).
 func (f *FileSize) UnmarshalJSON(data []byte) error {
-	var usage string
-	if err := json.Unmarshal(data, &usage); err != nil {
-		return err
+	var sizeNum uint64
+	if err := json.Unmarshal(data, &sizeNum); err == nil {
+		*f = FileSize(sizeNum)
+		return nil
+	}
+
+	var sizeStr string
+	if err := json.Unmarshal(data, &sizeStr); err != nil {
+		return fmt.Errorf("cannot unmarshal FileSize value(%s) to neither string nor uint64: %w", data, err)
 	}
 
-	bytes, err := parseUsageToBytes(usage)
+	size, err := parseSizeStrToBytes(sizeStr)
 	if err != nil {
 		return err
 	}
 
-	*f = FileSize(bytes)
+	*f = FileSize(size)
 	return nil
 }
 
-func parseUsageToBytes(usage string) (int64, error) {
+func parseSizeStrToBytes(usage string) (int64, error) {
 	parts := strings.Fields(usage)
 	if len(parts) < 1 {
 		return 0, fmt.Errorf("invalid format: %s", usage)
 	}
 
 	value, err := strconv.ParseFloat(parts[0], 64)
 	if err != nil {
-		return 0, err
+		return 0, fmt.Errorf("cannot parse float value: %f, %w", value, err)
 	}
 
 	if len(parts) < 2 {