style: Fix golangci lint issues

sensorbucket · Jan 7, 2025 · 5d5c4dd · 5d5c4dd
1 parent d1a0762
commit 5d5c4dd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/services/core/measurements/application.go b/services/core/measurements/application.go
@@ -58,15 +58,21 @@ func (s *Service) StartMeasurementBatchStorer(interval time.Duration) cleanupper
 		for {
 			select {
 			case <-stop:
-				s.CommitBatch(false)
+				if err := s.CommitBatch(false); err != nil {
+					log.Printf("error committing batch: %s\n", err.Error())
+				}
 				break outer
 			case m := <-s.measurementBatchChan:
 				s.measurementBatch = append(s.measurementBatch, m)
 				if len(s.measurementBatch) == cap(s.measurementBatch) {
-					s.CommitBatch(false)
+					if err := s.CommitBatch(false); err != nil {
+						log.Printf("error committing batch: %s\n", err.Error())
+					}
 				}
 			case <-t.C:
-				s.CommitBatch(false)
+				if err := s.CommitBatch(false); err != nil {
+					log.Printf("error committing batch: %s\n", err.Error())
+				}
 			}
 		}
 		close(done)

diff --git a/services/core/measurements/application_test.go b/services/core/measurements/application_test.go
@@ -196,7 +196,7 @@ func TestShouldCopyOverDefaultFields(t *testing.T) {
 	// Act
 	err = svc.ProcessPipelineMessage(msg)
 	require.NoError(t, err)
-	svc.CommitBatch(true)
+	assert.NoError(t, svc.CommitBatch(true))
 
 	// Assert
 	require.Len(t, store.calls.StoreMeasurements, 1, "StoreMeasurements should've been called")
@@ -334,7 +334,7 @@ func TestShouldChooseMeasurementLocationOverDeviceLocation(t *testing.T) {
 			require.NoError(t,
 				svc.ProcessPipelineMessage(msg),
 			)
-			svc.CommitBatch(true)
+			assert.NoError(t, svc.CommitBatch(true))
 
 			// Assert
 			require.Len(t, store.calls.StoreMeasurements, 1, "StoreMeasurements should've been called")
@@ -414,7 +414,7 @@ func TestShouldSetExpirationDate(t *testing.T) {
 		// Act
 		err = svc.ProcessPipelineMessage(msg)
 		require.NoError(t, err)
-		svc.CommitBatch(true)
+		assert.NoError(t, svc.CommitBatch(true))
 
 		// Assert
 		require.Len(t, store.calls.StoreMeasurements, 1, "StoreMeasurements should've been called")

diff --git a/services/core/measurements/datastreams.go b/services/core/measurements/datastreams.go
@@ -24,22 +24,3 @@ type Datastream struct {
 	CreatedAt         time.Time `json:"created_at" db:"created_at"`
 	TenantID          int64     `json:"-"`
 }
-
-func newDatastream(tenantID, sensorID int64, obs, uom string) (*Datastream, error) {
-	// TODO: Check UoM conforms to UCUM
-	if uom == "" || false {
-		return nil, ErrUoMInvalid
-	}
-	if sensorID == 0 {
-		return nil, ErrInvalidSensorID
-	}
-	return &Datastream{
-		ID:                uuid.New(),
-		TenantID:          tenantID,
-		Description:       "",
-		SensorID:          sensorID,
-		ObservedProperty:  obs,
-		UnitOfMeasurement: uom,
-		CreatedAt:         time.Now(),
-	}, nil
-}