Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/add transactions for sensor repo #383

Merged
merged 3 commits into from
Jan 27, 2025
Merged

feature/add transactions for sensor repo #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d9750f
feat: add transactions for sensor repo
Mohammad96Assaf Jan 22, 2025
9b450be
chor: remove with-functions from sesnor repo
Mohammad96Assaf Jan 26, 2025
af4c28c
chor: fix lint
Mohammad96Assaf Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions internal/service/domain/sensor/mqtt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
domain "github.com/green-ecolution/green-ecolution-backend/internal/entities"
"github.com/green-ecolution/green-ecolution-backend/internal/logger"
"github.com/green-ecolution/green-ecolution-backend/internal/storage"
storageSensor "github.com/green-ecolution/green-ecolution-backend/internal/storage/postgres/sensor"
)

func (s *SensorService) HandleMessage(ctx context.Context, payload *domain.MqttPayload) (*domain.SensorData, error) {
Expand Down Expand Up @@ -48,11 +47,13 @@ func (s *SensorService) HandleMessage(ctx context.Context, payload *domain.MqttP
sensor = updatedSensor
} else {
log.Info("a new sensor has joined the party! creating sensor record", "sensor_id", payload.Device, "sensor_latitude", payload.Latitude, "sensor_longitude", payload.Longitude)
createdSensor, err := s.sensorRepo.Create(ctx, storageSensor.WithSensorID(payload.Device),
storageSensor.WithLatitude(payload.Latitude),
storageSensor.WithLongitude(payload.Longitude),
storageSensor.WithStatus(domain.SensorStatusOnline),
)
createdSensor, err := s.sensorRepo.Create(ctx, func(s *domain.Sensor) (bool, error) {
s.ID = payload.Device
s.Latitude = payload.Latitude
s.Longitude = payload.Longitude
s.Status = domain.SensorStatusOnline
return true, nil
})
if err != nil {
log.Error("failed to update sensor", "error", err)
return nil, err
Expand Down Expand Up @@ -82,12 +83,12 @@ func (s *SensorService) HandleMessage(ctx context.Context, payload *domain.MqttP
func (s *SensorService) updateSensorCoordsAndStatus(ctx context.Context, payload *domain.MqttPayload, sensor *domain.Sensor) (*domain.Sensor, error) {
log := logger.GetLogger(ctx)
if sensor.Latitude != payload.Latitude || sensor.Longitude != payload.Longitude || sensor.Status != domain.SensorStatusOnline {
updatedSensor, err := s.sensorRepo.Update(
ctx,
sensor.ID,
storageSensor.WithLatitude(payload.Latitude),
storageSensor.WithLongitude(payload.Longitude),
storageSensor.WithStatus(domain.SensorStatusOnline))
updatedSensor, err := s.sensorRepo.Update(ctx, sensor.ID, func(s *domain.Sensor) (bool, error) {
s.Latitude = payload.Latitude
s.Longitude = payload.Longitude
s.Status = domain.SensorStatusOnline
return true, nil
})
if err != nil {
return nil, err
}
Expand Down
33 changes: 5 additions & 28 deletions internal/service/domain/sensor/mqtt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ func TestSensorService_HandleMessage(t *testing.T) {
}

sensorRepo.EXPECT().GetByID(context.Background(), testPayLoad.Device).Return(TestSensor, nil)
sensorRepo.EXPECT().Update(context.Background(),
TestSensor.ID,
mock.Anything,
mock.Anything,
mock.Anything).Return(TestSensor, nil)
sensorRepo.EXPECT().Update(context.Background(), TestSensor.ID, mock.Anything).Return(TestSensor, nil)
sensorRepo.EXPECT().InsertSensorData(context.Background(), insertData, testPayLoad.Device).Return(nil)
sensorRepo.EXPECT().GetLatestSensorDataBySensorID(context.Background(), TestSensor.ID).Return(TestSensorData[0], nil)

Expand Down Expand Up @@ -74,12 +70,7 @@ func TestSensorService_HandleMessage(t *testing.T) {
testPayload := TestListMQTTPayload[0]

sensorRepo.EXPECT().GetByID(context.Background(), testPayload.Device).Return(TestSensor, nil)
sensorRepo.EXPECT().Update(context.Background(),
TestSensor.ID,
mock.Anything,
mock.Anything,
mock.Anything).
Return(nil, errors.New("update error"))
sensorRepo.EXPECT().Update(context.Background(), TestSensor.ID, mock.Anything).Return(nil, errors.New("update error"))

// when
sensorData, err := svc.HandleMessage(context.Background(), testPayload)
Expand All @@ -103,12 +94,7 @@ func TestSensorService_HandleMessage(t *testing.T) {
}

sensorRepo.EXPECT().GetByID(context.Background(), testPayLoad.Device).Return(nil, nil).Once()
sensorRepo.EXPECT().Create(context.Background(),
mock.Anything,
mock.Anything,
mock.Anything,
mock.Anything).
Return(TestSensor, nil).Once()
sensorRepo.EXPECT().Create(context.Background(), mock.Anything).Return(TestSensor, nil).Once()
sensorRepo.EXPECT().InsertSensorData(context.Background(), insertData, TestSensor.ID).Return(nil).Once()
sensorRepo.EXPECT().GetLatestSensorDataBySensorID(context.Background(), TestSensor.ID).Return(TestSensorData[0], nil).Once()
sensorRepo.EXPECT().GetByID(context.Background(), TestSensor.ID).Return(TestSensor, nil).Once()
Expand Down Expand Up @@ -139,12 +125,7 @@ func TestSensorService_HandleMessage(t *testing.T) {
testPayload := TestListMQTTPayload[0]

sensorRepo.EXPECT().GetByID(context.Background(), testPayload.Device).Return(nil, nil)
sensorRepo.EXPECT().Create(context.Background(),
mock.Anything,
mock.Anything,
mock.Anything,
mock.Anything).
Return(nil, errors.New("create error"))
sensorRepo.EXPECT().Create(context.Background(), mock.Anything).Return(nil, errors.New("create error"))

// when
sensorData, err := svc.HandleMessage(context.Background(), testPayload)
Expand Down Expand Up @@ -215,11 +196,7 @@ func TestSensorService_HandleMessage(t *testing.T) {
}

sensorRepo.EXPECT().GetByID(context.Background(), testPayLoad.Device).Return(TestSensor, nil)
sensorRepo.EXPECT().Update(context.Background(),
TestSensor.ID,
mock.Anything,
mock.Anything,
mock.Anything).Return(TestSensor, nil)
sensorRepo.EXPECT().Update(context.Background(), TestSensor.ID, mock.Anything).Return(TestSensor, nil)
sensorRepo.EXPECT().InsertSensorData(context.Background(), insertData, testPayLoad.Device).Return(errors.New("insert error"))

// when
Expand Down
21 changes: 12 additions & 9 deletions internal/service/domain/sensor/sensor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/green-ecolution/green-ecolution-backend/internal/logger"
"github.com/green-ecolution/green-ecolution-backend/internal/service"
"github.com/green-ecolution/green-ecolution-backend/internal/storage"
"github.com/green-ecolution/green-ecolution-backend/internal/storage/postgres/sensor"
"github.com/green-ecolution/green-ecolution-backend/internal/storage/postgres/tree"
"github.com/green-ecolution/green-ecolution-backend/internal/worker"
)
Expand Down Expand Up @@ -79,10 +78,12 @@ func (s *SensorService) Create(ctx context.Context, sc *entities.SensorCreate) (
return nil, service.MapError(ctx, errors.Join(err, service.ErrValidation), service.ErrorLogValidation)
}

created, err := s.sensorRepo.Create(ctx,
sensor.WithLatestData(sc.LatestData),
sensor.WithStatus(sc.Status),
)
created, err := s.sensorRepo.Create(ctx, func(s *entities.Sensor) (bool, error) {
s.LatestData = sc.LatestData
s.Status = sc.Status
return true, nil
})

if err != nil {
log.Debug("failed to create sensor", "error", err, "sensor_id", sc.ID)
return nil, service.MapError(ctx, err, service.ErrorLogAll)
Expand All @@ -104,10 +105,12 @@ func (s *SensorService) Update(ctx context.Context, id string, su *entities.Sens
return nil, service.MapError(ctx, err, service.ErrorLogEntityNotFound)
}

updated, err := s.sensorRepo.Update(ctx, id,
sensor.WithLatestData(su.LatestData),
sensor.WithStatus(su.Status),
)
updated, err := s.sensorRepo.Update(ctx, id, func(s *entities.Sensor) (bool, error) {
s.LatestData = su.LatestData
s.Status = su.Status
return true, nil
})

if err != nil {
log.Debug("failed to update sensor", "sensor_id", id, "error", err)
return nil, service.MapError(ctx, err, service.ErrorLogAll)
Expand Down
32 changes: 5 additions & 27 deletions internal/service/domain/sensor/sensor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,7 @@ func TestSensorService_Create(t *testing.T) {
flowerbedRepo := storageMock.NewMockFlowerbedRepository(t)
svc := sensor.NewSensorService(sensorRepo, treeRepo, flowerbedRepo, globalEventManager)

sensorRepo.EXPECT().Create(
context.Background(),
mock.Anything,
mock.Anything,
).Return(TestSensor, nil)
sensorRepo.EXPECT().Create(context.Background(), mock.Anything).Return(TestSensor, nil)

// when
result, err := svc.Create(context.Background(), newSensor)
Expand All @@ -126,11 +122,7 @@ func TestSensorService_Create(t *testing.T) {

newSensor.LatestData = &entities.SensorData{}

sensorRepo.EXPECT().Create(
context.Background(),
mock.Anything,
mock.Anything,
).Return(TestSensor, nil)
sensorRepo.EXPECT().Create(context.Background(), mock.Anything).Return(TestSensor, nil)

// when
result, err := svc.Create(context.Background(), newSensor)
Expand Down Expand Up @@ -211,11 +203,7 @@ func TestSensorService_Create(t *testing.T) {
newSensor.Latitude = 9.446741
newSensor.Longitude = 54.801539

sensorRepo.EXPECT().Create(
context.Background(),
mock.Anything,
mock.Anything,
).Return(nil, expectedErr)
sensorRepo.EXPECT().Create(context.Background(), mock.Anything).Return(nil, expectedErr)

// when
result, err := svc.Create(context.Background(), newSensor)
Expand Down Expand Up @@ -245,12 +233,7 @@ func TestSensorService_Update(t *testing.T) {

sensorRepo.EXPECT().GetByID(context.Background(), id).Return(TestSensor, nil)

sensorRepo.EXPECT().Update(
context.Background(),
id,
mock.Anything,
mock.Anything,
).Return(TestSensor, nil)
sensorRepo.EXPECT().Update(context.Background(), id, mock.Anything).Return(TestSensor, nil)

// when
result, err := svc.Update(context.Background(), id, updateSensor)
Expand Down Expand Up @@ -291,12 +274,7 @@ func TestSensorService_Update(t *testing.T) {

sensorRepo.EXPECT().GetByID(context.Background(), id).Return(TestSensor, nil)

sensorRepo.EXPECT().Update(
context.Background(),
id,
mock.Anything,
mock.Anything,
).Return(nil, expectedErr)
sensorRepo.EXPECT().Update(context.Background(), id, mock.Anything).Return(nil, expectedErr)

// when
result, err := svc.Update(context.Background(), id, updateSensor)
Expand Down
6 changes: 4 additions & 2 deletions internal/service/domain/sensor/statusUpdater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/green-ecolution/green-ecolution-backend/internal/entities"
"github.com/green-ecolution/green-ecolution-backend/internal/logger"
"github.com/green-ecolution/green-ecolution-backend/internal/storage"
"github.com/green-ecolution/green-ecolution-backend/internal/storage/postgres/sensor"
)

type StatusUpdater struct {
Expand Down Expand Up @@ -49,7 +48,10 @@ func (s *StatusUpdater) updateStaleSensorStatuses(ctx context.Context) error {
cutoffTime := time.Now().Add(-72 * time.Hour) // 3 days ago
for _, sens := range sensors {
if sens.UpdatedAt.Before(cutoffTime) {
_, err = s.sensorRepo.Update(ctx, sens.ID, sensor.WithStatus(entities.SensorStatusOffline))
_, err = s.sensorRepo.Update(ctx, sens.ID, func(s *entities.Sensor) (bool, error) {
s.Status = entities.SensorStatusOffline
return true, nil
})
if err != nil {
log.Error("failed to update sensor status to offline", "sensor_id", sens.ID, "error", err, "prev_sensor_status", sens.Status)
} else {
Expand Down
75 changes: 53 additions & 22 deletions internal/storage/postgres/sensor/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"encoding/json"

"github.com/green-ecolution/green-ecolution-backend/internal/logger"
"github.com/green-ecolution/green-ecolution-backend/internal/storage/postgres/store"

"github.com/green-ecolution/green-ecolution-backend/internal/storage"

"github.com/green-ecolution/green-ecolution-backend/internal/entities"
Expand All @@ -21,39 +23,68 @@ func defaultSensor() *entities.Sensor {
}
}

func (r *SensorRepository) Create(ctx context.Context, sFn ...entities.EntityFunc[entities.Sensor]) (*entities.Sensor, error) {
func (r *SensorRepository) Create(ctx context.Context, createFn func(*entities.Sensor) (bool, error)) (*entities.Sensor, error) {
log := logger.GetLogger(ctx)
entity := defaultSensor()
for _, fn := range sFn {
fn(entity)
if createFn == nil {
return nil, errors.New("createFn is nil")
}

sensor, _ := r.GetByID(ctx, entity.ID)
if sensor != nil {
return nil, errors.New("sensor with same ID already exists")
}
var createdSensor *entities.Sensor
err := r.store.WithTx(ctx, func(s *store.Store) error {
oldStore := r.store
defer func() {
r.store = oldStore
}()
r.store = s

if err := r.validateSensorEntity(entity); err != nil {
return nil, err
}
entity := defaultSensor()

id, err := r.createEntity(ctx, entity)
if err != nil {
log.Error("failed to create sensor entity in db", "error", err)
return nil, err
}
created, err := createFn(entity)
if err != nil {
return err
}

entity.ID = id
log.Debug("sensor entity created successfully in db", "sensor_id", id)
if !created {
return nil
}

existingSensor, _ := r.GetByID(ctx, entity.ID)
if existingSensor != nil {
return errors.New("sensor with same ID already exists")
}

if entity.LatestData != nil && entity.LatestData.Data != nil {
err = r.InsertSensorData(ctx, entity.LatestData, id)
if err := r.validateSensorEntity(entity); err != nil {
return err
}

id, err := r.createEntity(ctx, entity)
if err != nil {
log.Error("failed to create sensor entity in db", "error", err)
return err
}
entity.ID = id
log.Debug("sensor entity created successfully in db", "sensor_id", id)

if entity.LatestData != nil && entity.LatestData.Data != nil {
err = r.InsertSensorData(ctx, entity.LatestData, id)
if err != nil {
return err
}
}

createdSensor, err = r.GetByID(ctx, id)
if err != nil {
return nil, err
return err
}

return nil
})

if err != nil {
return nil, err
}

return r.GetByID(ctx, id)
return createdSensor, nil
}

func (r *SensorRepository) InsertSensorData(ctx context.Context, latestData *entities.SensorData, id string) error {
Expand Down
Loading
Loading