refactor: standardize variable naming and formatting across repositories

Author: raphico

internal/db/command_repository.go

@@ -150,7 +150,7 @@ func (r *CommandRepository) FindById(
 ) (*command.Command, error) {
 	var (
 		commandID   uuid.UUID
-		dbDeviceID    uuid.UUID
+		dbDeviceID  uuid.UUID
 		commandName string
 		payload     []byte
 		status      string

internal/db/device_repository.go

@@ -69,7 +69,7 @@ func (r *DeviceRepository) FindById(
 ) (*device.Device, error) {
 	var (
 		deviceID   uuid.UUID
-		dbUserID     uuid.UUID
+		uID        uuid.UUID
 		name       string
 		deviceType string
 		status     string
@@ -84,7 +84,7 @@ func (r *DeviceRepository) FindById(
 		WHERE id = $1 AND user_id = $2
 	`
 
-	err := r.db.QueryRow(ctx, query, id, dbUserID).Scan(
+	err := r.db.QueryRow(ctx, query, id, uID).Scan(
 		&deviceID,
 		&userID,
 		&name,
@@ -104,8 +104,8 @@ func (r *DeviceRepository) FindById(
 	}
 
 	return device.RehydrateDevice(
-		device.DeviceID(deviceID),
-		user.UserID(userID),
+		deviceID,
+		uID,
 		name,
 		deviceType,
 		status,
@@ -182,8 +182,8 @@ func (r *DeviceRepository) FindDevices(
 		}
 
 		dev, err := device.RehydrateDevice(
-			device.DeviceID(deviceID),
-			user.UserID(uID),
+			deviceID,
+			uID,
 			name,
 			deviceType,
 			status,

internal/db/user_repository.go

@@ -87,5 +87,5 @@ func (r *UserRepository) FindByEmail(ctx context.Context, email user.Email) (*us
 		return nil, fmt.Errorf("failed to find user: %w", err)
 	}
 
-	return user.RehydrateUser(user.UserID(id), emailStr, usernameStr, passwordHash, createdAt, updatedAt)
+	return user.RehydrateUser(id, emailStr, usernameStr, passwordHash, createdAt, updatedAt)
 }

internal/domain/command/service.go

@@ -41,11 +41,11 @@ func (s *Service) ListDeviceCommands(
 }
 
 func (s *Service) UpdateCommandStatus(
-	ctx context.Context, 
+	ctx context.Context,
 	id CommandID,
 	deviceID device.DeviceID,
 	status Status,
-	executedAt ExecutedAt,	
+	executedAt ExecutedAt,
 ) (*Command, error) {
 	cmd, err := s.repo.FindById(ctx, id, deviceID)
 	if err != nil {

internal/domain/device/device.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/raphico/go-device-telemetry-api/internal/domain/user"
 )
 
@@ -52,8 +53,8 @@ func (d *Device) UpdateMetadata(m map[string]any) {
 }
 
 func RehydrateDevice(
-	id DeviceID,
-	userID user.UserID,
+	id uuid.UUID,
+	userID uuid.UUID,
 	name string,
 	deviceType string,
 	status string,
@@ -87,8 +88,8 @@ func RehydrateDevice(
 	}
 
 	return &Device{
-		ID:         id,
-		UserID:     userID,
+		ID:         DeviceID(id),
+		UserID:     user.UserID(userID),
 		Name:       n,
 		Status:     s,
 		DeviceType: dt,

internal/domain/user/user.go

@@ -3,6 +3,8 @@ package user
 import (
 	"fmt"
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type User struct {
@@ -23,7 +25,7 @@ func NewUser(email Email, username Username, password Password) *User {
 }
 
 func RehydrateUser(
-	id UserID,
+	id uuid.UUID,
 	emailStr string,
 	usernameStr string,
 	passwordHash []byte,
@@ -39,7 +41,7 @@ func RehydrateUser(
 	}
 
 	return &User{
-		ID:        id,
+		ID:        UserID(id),
 		Email:     e,
 		Username:  uname,
 		Password:  PasswordFromHash(passwordHash),

internal/http/command_handler.go

@@ -154,10 +154,9 @@ func (h *CommandHandler) HandleGetDeviceCommands(w http.ResponseWriter, r *http.
 	WriteJSON(w, http.StatusOK, out, meta)
 }
 
-
 type updateCommandStatusRequest struct {
-	Status      string    `json:"status"`
-	ExecutedAt  string `json:"executed_at"`
+	Status     string `json:"status"`
+	ExecutedAt string `json:"executed_at"`
 }
 
 func (h *CommandHandler) HandleUpdateCommandStatus(w http.ResponseWriter, r *http.Request) {
@@ -175,7 +174,6 @@ func (h *CommandHandler) HandleUpdateCommandStatus(w http.ResponseWriter, r *htt
 		return
 	}
 
-
 	var req updateCommandStatusRequest
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		WriteJSONError(w, http.StatusBadRequest, invalidRequest, "Invalid request body")
@@ -187,7 +185,7 @@ func (h *CommandHandler) HandleUpdateCommandStatus(w http.ResponseWriter, r *htt
 		WriteJSONError(w, http.StatusBadRequest, invalidRequest, err.Error())
 		return
 	}
-	
+
 	executedAt, err := command.NewExecutedAt(req.ExecutedAt)
 	if err != nil {
 		WriteJSONError(w, http.StatusBadRequest, invalidRequest, err.Error())