Simplify return of GetRecord

DEXPRO-Solutions-GmbH · Feb 2, 2024 · a8a6af9 · a8a6af9
1 parent acd630b
commit a8a6af9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/r_get_record.go b/r_get_record.go
@@ -2,6 +2,7 @@ package easclient
 
 import (
 	"context"
+	"encoding/xml"
 	"time"
 
 	"github.com/google/uuid"
@@ -28,7 +29,12 @@ func (c *StoreClient) GetRecord(ctx context.Context, id uuid.UUID) (*Record, err
 		return nil, err
 	}
 
-	var result Record
+	type RecordResponse struct {
+		XMLName xml.Name `xml:"records"`
+		Record  *Record  `xml:"record"`
+	}
+
+	var result RecordResponse
 
 	req.SetResult(&result)
 	res, err := req.Get("/record/" + id.String())
@@ -40,5 +46,5 @@ func (c *StoreClient) GetRecord(ctx context.Context, id uuid.UUID) (*Record, err
 		return nil, err
 	}
 
-	return &result, nil
+	return result.Record, nil
 }
diff --git a/record.go b/record.go
@@ -1,7 +1,6 @@
 package easclient
 
 import (
-	"encoding/xml"
 	"time"
 
 	"github.com/google/uuid"
@@ -24,25 +23,22 @@ type RecordField struct {
 }
 
 type Record struct {
-	XMLName xml.Name `xml:"records"`
-	Record  struct {
-		DocumentType           string         `xml:"documentType"`
-		MasterId               uuid.UUID      `xml:"masterId"`
-		ArchiveDateTime        time.Time      `xml:"archiveDateTime"`
-		ID                     uuid.UUID      `xml:"id"`
-		Version                string         `xml:"version"`
-		ArchiverLogin          string         `xml:"archiverLogin"`
-		Archiver               string         `xml:"archiver"`
-		InitialArchiver        string         `xml:"initialArchiver"`
-		InitialArchiverLogin   string         `xml:"initialArchiverLogin"`
-		InitialArchiveDateTime time.Time      `xml:"initialArchiveDateTime"`
-		Field                  []*RecordField `xml:"field"`
-		Attachment             struct {
-			Name     string `xml:"name"`
-			Size     string `xml:"size"`
-			Register string `xml:"register"`
-			Author   string `xml:"author"`
-			ID       string `xml:"id"`
-		} `xml:"attachment"`
-	} `xml:"record"`
+	DocumentType           string         `xml:"documentType"`
+	MasterId               uuid.UUID      `xml:"masterId"`
+	ArchiveDateTime        time.Time      `xml:"archiveDateTime"`
+	ID                     uuid.UUID      `xml:"id"`
+	Version                string         `xml:"version"`
+	ArchiverLogin          string         `xml:"archiverLogin"`
+	Archiver               string         `xml:"archiver"`
+	InitialArchiver        string         `xml:"initialArchiver"`
+	InitialArchiverLogin   string         `xml:"initialArchiverLogin"`
+	InitialArchiveDateTime time.Time      `xml:"initialArchiveDateTime"`
+	Fields                 []*RecordField `xml:"field"`
+	Attachment             struct {
+		Name     string `xml:"name"`
+		Size     string `xml:"size"`
+		Register string `xml:"register"`
+		Author   string `xml:"author"`
+		ID       string `xml:"id"`
+	} `xml:"attachment"`
 }