Merge pull request #104 from OpenVPN/bugfix/device-crud

Fix CRUD for devices

Author: vladhss

cloudconnexa/devices.go

@@ -136,11 +136,18 @@ func (d *DevicesService) ListAll() ([]DeviceDetail, error) {
 }
 
 // GetByID retrieves a specific device by its ID.
-func (d *DevicesService) GetByID(deviceID string) (*DeviceDetail, error) {
+// userID is sent as the required ?userId= query parameter.
+func (d *DevicesService) GetByID(userID, deviceID string) (*DeviceDetail, error) {
+	if err := validateID(userID); err != nil {
+		return nil, err
+	}
 	if err := validateID(deviceID); err != nil {
 		return nil, err
 	}
-	endpoint := buildURL(d.client.GetV1Url(), "devices", deviceID)
+
+	params := url.Values{}
+	params.Set("userId", userID)
+	endpoint := fmt.Sprintf("%s?%s", buildURL(d.client.GetV1Url(), "devices", deviceID), params.Encode())
 	req, err := http.NewRequest(http.MethodGet, endpoint, nil)
 	if err != nil {
 		return nil, err
@@ -161,7 +168,11 @@ func (d *DevicesService) GetByID(deviceID string) (*DeviceDetail, error) {
 }
 
 // Update updates an existing device by its ID.
-func (d *DevicesService) Update(deviceID string, updateRequest DeviceUpdateRequest) (*DeviceDetail, error) {
+// userID is sent as the required ?userId= query parameter.
+func (d *DevicesService) Update(userID, deviceID string, updateRequest DeviceUpdateRequest) (*DeviceDetail, error) {
+	if err := validateID(userID); err != nil {
+		return nil, err
+	}
 	if err := validateID(deviceID); err != nil {
 		return nil, err
 	}
@@ -170,8 +181,10 @@ func (d *DevicesService) Update(deviceID string, updateRequest DeviceUpdateReque
 		return nil, err
 	}
 
-	endpoint := buildURL(d.client.GetV1Url(), "devices", deviceID)
-	req, err := http.NewRequest(http.MethodPost, endpoint, bytes.NewBuffer(requestJSON))
+	params := url.Values{}
+	params.Set("userId", userID)
+	endpoint := fmt.Sprintf("%s?%s", buildURL(d.client.GetV1Url(), "devices", deviceID), params.Encode())
+	req, err := http.NewRequest(http.MethodPut, endpoint, bytes.NewBuffer(requestJSON))
 	if err != nil {
 		return nil, err
 	}
@@ -219,22 +232,6 @@ func (d *DevicesService) ListByUserID(userID string) ([]DeviceDetail, error) {
 	return allDevices, nil
 }
 
-// UpdateName updates the name of a device.
-func (d *DevicesService) UpdateName(deviceID string, name string) (*DeviceDetail, error) {
-	updateRequest := DeviceUpdateRequest{
-		Name: name,
-	}
-	return d.Update(deviceID, updateRequest)
-}
-
-// UpdateDescription updates the description of a device.
-func (d *DevicesService) UpdateDescription(deviceID string, description string) (*DeviceDetail, error) {
-	updateRequest := DeviceUpdateRequest{
-		Description: description,
-	}
-	return d.Update(deviceID, updateRequest)
-}
-
 // Create creates a new device for the given user.
 // userID is sent as the required ?userId= query parameter.
 func (d *DevicesService) Create(userID string, req DeviceCreateRequest) (*DeviceDetail, error) {

cloudconnexa/devices_test.go

@@ -98,6 +98,9 @@ func TestDevicesService_GetByID(t *testing.T) {
 		if r.URL.Path != "/api/v1/devices/device-123" {
 			t.Errorf("Expected path /api/v1/devices/device-123, got %s", r.URL.Path)
 		}
+		if got := r.URL.Query().Get("userId"); got != "user-123" {
+			t.Errorf("Expected userId=user-123, got %s", got)
+		}
 
 		// Mock response
 		device := DeviceDetail{
@@ -115,7 +118,7 @@ func TestDevicesService_GetByID(t *testing.T) {
 	client := createTestClient(server)
 
 	// Test the GetByID method
-	result, err := client.Devices.GetByID("device-123")
+	result, err := client.Devices.GetByID("user-123", "device-123")
 	if err != nil {
 		t.Fatalf("Expected no error, got %v", err)
 	}
@@ -133,12 +136,15 @@ func TestDevicesService_Update(t *testing.T) {
 	// Create a mock server
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Check the request method and path
-		if r.Method != http.MethodPost {
-			t.Errorf("Expected POST request, got %s", r.Method)
+		if r.Method != http.MethodPut {
+			t.Errorf("Expected PUT request, got %s", r.Method)
 		}
 		if r.URL.Path != "/api/v1/devices/device-123" {
 			t.Errorf("Expected path /api/v1/devices/device-123, got %s", r.URL.Path)
 		}
+		if got := r.URL.Query().Get("userId"); got != "user-123" {
+			t.Errorf("Expected userId=user-123, got %s", got)
+		}
 
 		// Mock response
 		device := DeviceDetail{
@@ -161,7 +167,7 @@ func TestDevicesService_Update(t *testing.T) {
 		Name:        "Updated Device Name",
 		Description: "Updated description",
 	}
-	result, err := client.Devices.Update("device-123", updateRequest)
+	result, err := client.Devices.Update("user-123", "device-123", updateRequest)
 	if err != nil {
 		t.Fatalf("Expected no error, got %v", err)
 	}