room

Author: FoseFx

services/tasks-svc/internal/room/room.go

@@ -1,14 +1,18 @@
 package room
 
 import (
+	"common"
 	"context"
+	commonpb "gen/libs/common/v1"
 	"github.com/google/uuid"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 	"hwdb"
 	"hwutil"
 	"strconv"
 	"tasks-svc/internal/tracking"
+	"tasks-svc/internal/util"
 	"tasks-svc/repos/room_repo"
 
 	pb "gen/services/tasks_svc/v1"
@@ -100,7 +104,6 @@ func (ServiceServer) GetRoom(ctx context.Context, req *pb.GetRoomRequest) (*pb.G
 }
 
 func (ServiceServer) UpdateRoom(ctx context.Context, req *pb.UpdateRoomRequest) (*pb.UpdateRoomResponse, error) {
-	roomRepo := room_repo.New(hwdb.GetDB())
 
 	// TODO: Auth
 
@@ -109,7 +112,20 @@ func (ServiceServer) UpdateRoom(ctx context.Context, req *pb.UpdateRoomRequest)
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	consistency, err := roomRepo.UpdateRoom(ctx, room_repo.UpdateRoomParams{
+	expConsistency, ok := hwutil.ParseConsistency(req.Consistency)
+	if !ok {
+		return nil, common.UnparsableConsistencyError(ctx, "consistency")
+	}
+
+	// Start TX
+	tx, rollback, err := hwdb.BeginTx(hwdb.GetDB(), ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer rollback()
+	roomRepo := room_repo.New(tx)
+
+	result, err := roomRepo.UpdateRoom(ctx, room_repo.UpdateRoomParams{
 		ID:   patientID,
 		Name: req.Name,
 	})
@@ -118,9 +134,42 @@ func (ServiceServer) UpdateRoom(ctx context.Context, req *pb.UpdateRoomRequest)
 		return nil, err
 	}
 
+	// conflict detection
+	if expConsistency != nil && *expConsistency != uint64(result.OldConsistency) {
+		conflicts := make(map[string]*commonpb.AttributeConflict)
+
+		if req.Name != nil && *req.Name != result.OldName {
+			conflicts["name"], err = util.AttributeConflict(
+				wrapperspb.String(result.OldName),
+				wrapperspb.String(*req.Name),
+			)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		if len(conflicts) != 0 {
+			// prevent the update
+			if err := hwdb.Error(ctx, tx.Rollback(ctx)); err != nil {
+				return nil, err
+			}
+
+			// return conflict
+			return &pb.UpdateRoomResponse{
+				Conflict:    &commonpb.Conflict{ConflictingAttributes: conflicts},
+				Consistency: strconv.FormatUint(uint64(result.OldConsistency), 10),
+			}, nil
+		}
+	}
+
+	// Commit Update
+	if err := hwdb.Error(ctx, tx.Commit(ctx)); err != nil {
+		return nil, err
+	}
+
 	return &pb.UpdateRoomResponse{
-		Conflict:    nil, // TODO
-		Consistency: strconv.FormatUint(uint64(consistency), 10),
+		Conflict:    nil,
+		Consistency: strconv.FormatUint(uint64(result.Consistency), 10),
 	}, nil
 }
 

services/tasks-svc/repos/room_repo.sql

@@ -76,11 +76,21 @@ WHERE rooms.ward_id = @ward_id
 ORDER BY rooms.id ASC, beds.name ASC;
 
 -- name: UpdateRoom :one
+WITH old_table AS (
+	SELECT
+		name as old_name,
+		consistency	as old_consistency
+	FROM rooms
+	WHERE rooms.id = @id
+)
 UPDATE rooms
 SET	name = coalesce(sqlc.narg('name'), name),
 	consistency = consistency + 1
-WHERE id = @id
-RETURNING consistency;
+WHERE rooms.id = @id
+RETURNING
+	consistency,
+	(SELECT old_name FROM old_table),
+	(SELECT old_consistency FROM old_table);
 
 -- name: DeleteRoom :exec
 DELETE FROM rooms WHERE id = @id;

services/tasks-svc/repos/room_repo/room_repo.sql.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	pb "gen/services/tasks_svc/v1"
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 	"hwutil"
 	"strconv"
 	"testing"
@@ -287,3 +288,48 @@ func TestGetRoomOverviewsByWard(t *testing.T) {
 	assert.JSONEq(t, string(expectedRoomAJson), string(resRoomAJson))
 	assert.JSONEq(t, string(expectedRoomBJson), string(resRoomBJson))
 }
+
+func TestUpdateRoomConflict(t *testing.T) {
+	ctx := context.Background()
+	roomClient := roomServiceClient()
+
+	// prepare
+	wardId, _ := prepareWard(t, ctx, "")
+	roomId, initialConsistency := prepareRoom(t, ctx, wardId, "")
+
+	name1 := "This came first"
+
+	// update 1
+	update1Res, err := roomClient.UpdateRoom(ctx, &pb.UpdateRoomRequest{
+		Id:          roomId,
+		Name:        &name1,
+		Consistency: &initialConsistency,
+	})
+	assert.NoError(t, err)
+	assert.Nil(t, update1Res.Conflict)
+	assert.NotEqual(t, initialConsistency, update1Res.Consistency)
+
+	name2 := "This came second"
+
+	// racing update 2
+	update2Res, err := roomClient.UpdateRoom(ctx, &pb.UpdateRoomRequest{
+		Id:          roomId,
+		Name:        &name2,
+		Consistency: &initialConsistency,
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, update1Res.Consistency, update2Res.Consistency)
+	assert.NotNil(t, update2Res.Conflict)
+
+	nameRes := update2Res.Conflict.ConflictingAttributes["name"]
+	assert.NotNil(t, nameRes)
+
+	nameIs := &wrapperspb.StringValue{}
+	assert.NoError(t, nameRes.Is.UnmarshalTo(nameIs))
+	assert.Equal(t, name1, nameIs.Value)
+
+	nameWant := &wrapperspb.StringValue{}
+	assert.NoError(t, nameRes.Want.UnmarshalTo(nameWant))
+	assert.Equal(t, name2, nameWant.Value)
+
+}

services/tasks-svc/stories/RoomCRUD_test.go

@@ -110,6 +110,8 @@ func TestGetRecentWards(t *testing.T) {
 				Id:    patientID,
 				BedId: bedId,
 			})
+			time.Sleep(time.Millisecond * 100)
+
 			assert.NoError(t, err, "could not assign bed to patient")
 			_, err = taskClient.CreateTask(ctx, &pb.CreateTaskRequest{
 				Name:          t.Name() + " Patient " + bedSuffix + " Task ",