fix(pkg): pointer and method fixes

speckleworks · Oct 5, 2019 · c26bd58 · c26bd58
1 parent 282ec86
commit c26bd58
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 45 deletions.
diff --git a/pkg/apiClients.go b/pkg/apiClients.go
@@ -9,7 +9,7 @@ const apiClientBasePath = "clients"
 
 // APIClient is the request response when fetching apiClients
 type APIClient struct {
-	Metadata         Metadata
+	Metadata
 	Role             string `json:"role,omitempty"`
 	DocumentName     string `json:"documentName,omitempty"`
 	DocumentType     string `json:"documentType,omitempty"`
@@ -22,7 +22,7 @@ type APIClient struct {
 
 // APIClientRequest is the request payload used to create and update apiClients
 type APIClientRequest struct {
-	Metadata         *RequestMetadata
+	RequestMetadata
 	Role             string `json:"role,omitempty"`
 	DocumentName     string `json:"documentName,omitempty"`
 	DocumentType     string `json:"documentType,omitempty"`
@@ -134,20 +134,3 @@ func (s *APIClientService) CreateComment(ctx context.Context, id string, new Com
 
 	return resource, resp, nil
 }
-
-// GetComments will get comments for a specific APIClient indexed by ID.
-func (s *APIClientService) GetComments(ctx context.Context, id string) ([]Comment, *http.Response, error) {
-	resource := new([]Comment)
-
-	req, err := s.client.NewRequest(ctx, http.MethodGet, "comments/"+apiClientBasePath+"/"+id, nil)
-	if err != nil {
-		return *resource, nil, err
-	}
-
-	resp, _, err := s.client.Do(ctx, req, &resource, false)
-	if err != nil {
-		return *resource, nil, err
-	}
-
-	return *resource, resp, nil
-}
diff --git a/pkg/objects.go b/pkg/objects.go
@@ -10,7 +10,7 @@ const objectBasePath = "objects"
 
 // Object is the request response when fetching objects
 type Object struct {
-	Metadata      Metadata
+	Metadata
 	ApplicationID string                 `json:"applicationId,omitempty"`
 	Hash          string                 `json:"hash,omitempty"`
 	GeometryHash  string                 `json:"geometryHash,omitempty"`
@@ -25,7 +25,7 @@ type Object struct {
 
 // ObjectRequest is the request payload used to create and update objects
 type ObjectRequest struct {
-	Metadata      *RequestMetadata
+	RequestMetadata
 	ApplicationID string                 `json:"applicationId,omitempty"`
 	Hash          string                 `json:"hash,omitempty"`
 	GeometryHash  string                 `json:"geometryHash,omitempty"`
@@ -51,11 +51,11 @@ type ObjectService struct {
 	client *Client
 }
 
-// List retrieves a list of Objects
-func (s *ObjectService) List(ctx context.Context) ([]Object, *http.Response, error) {
+// Search retrieves a list of Objects
+func (s *ObjectService) Search(ctx context.Context, query string, ids []string) ([]Object, *http.Response, error) {
 	resource := new([]Object)
 
-	req, err := s.client.NewRequest(ctx, http.MethodGet, objectBasePath, nil)
+	req, err := s.client.NewRequest(ctx, http.MethodPost, objectBasePath+"/getbulk?"+query, ids)
 	if err != nil {
 		return *resource, nil, err
 	}
@@ -158,7 +158,7 @@ func (s *ObjectService) GetComments(ctx context.Context, id string) ([]Comment,
 		return *resource, nil, err
 	}
 
-	resp, _, err := s.client.Do(ctx, req, &resource, false)
+	resp, _, err := s.client.Do(ctx, req, resource, false)
 	if err != nil {
 		return *resource, nil, err
 	}

diff --git a/pkg/projects.go b/pkg/projects.go
@@ -15,7 +15,7 @@ type ProjectPermissions struct {
 
 // Project is the request response when fetching projects
 type Project struct {
-	Metadata    Metadata
+	Metadata
 	Name        string             `json:"name"`
 	Tags        []string           `json:"tags,omitempty"`
 	Streams     []string           `json:"streams,omitempty"`
@@ -31,10 +31,10 @@ type ProjectStreamResponse struct {
 
 // ProjectRequest is the request payload used to create and update projects
 type ProjectRequest struct {
-	Metadata *RequestMetadata
-	Name     string   `json:"name"`
-	Tags     []string `json:"tags"`
-	Streams  []string `json:"streams"`
+	RequestMetadata
+	Name    string   `json:"name"`
+	Tags    []string `json:"tags"`
+	Streams []string `json:"streams"`
 }
 
 // ProjectService is the service that communicates with the Projects API
@@ -149,7 +149,7 @@ func (s *ProjectService) GetComments(ctx context.Context, id string) ([]Comment,
 		return *resource, nil, err
 	}
 
-	resp, _, err := s.client.Do(ctx, req, &resource, false)
+	resp, _, err := s.client.Do(ctx, req, resource, false)
 	if err != nil {
 		return *resource, nil, err
 	}

diff --git a/pkg/resourcebase.go b/pkg/resourcebase.go
@@ -5,16 +5,16 @@ import "time"
 // Metadata is the common metadata all resources (bar accounts) possess when returned
 // from the Speckle Server.
 type Metadata struct {
-	ID                string    `json:"_id,omitempty"`
-	Private           bool      `json:"private"`
-	CanRead           []string  `json:"canRead"`
-	CanWrite          []string  `json:"canWrite"`
-	Owner             string    `json:"owner"`
-	AnonymousComments bool      `json:"anonymousComments"`
-	Comments          []string  `json:"comments"`
-	CreatedAt         time.Time `json:"createdAt,omitempty"`
-	UpdatedAt         time.Time `json:"updatedAt,omitempty"`
-	Version           int       `json:"__v"`
+	ID                string     `json:"_id,omitempty"`
+	Private           bool       `json:"private"`
+	CanRead           []string   `json:"canRead"`
+	CanWrite          []string   `json:"canWrite"`
+	Owner             string     `json:"owner"`
+	AnonymousComments bool       `json:"anonymousComments"`
+	Comments          []string   `json:"comments"`
+	CreatedAt         *time.Time `json:"createdAt,omitempty"`
+	UpdatedAt         *time.Time `json:"updatedAt,omitempty"`
+	Version           int        `json:"__v"`
 }
 
 // RequestMetadata is the common metadata all resources (bar accounts) should posess

diff --git a/pkg/streams.go b/pkg/streams.go
@@ -41,8 +41,8 @@ type Layer struct {
 
 // Stream is the request response when fetching streams
 type Stream struct {
-	*Metadata
-	StreamID      string   `json:"streamdId,omitempty"`
+	Metadata
+	StreamID      string   `json:"streamId,omitempty"`
 	Name          string   `json:"name,omitempty"`
 	Description   string   `json:"description,omitempty"`
 	Tags          []string `json:"tags,omitempty"`
@@ -61,7 +61,7 @@ type StreamStreamResponse struct {
 
 // StreamRequest is the request payload used to create and update streams
 type StreamRequest struct {
-	*RequestMetadata
+	RequestMetadata
 	Name          string    `json:"name,omitempty"`
 	Description   string    `json:"description,omitempty"`
 	Tags          []string  `json:"tags,omitempty"`
@@ -208,7 +208,7 @@ func (s *StreamService) GetComments(ctx context.Context, id string) ([]Comment,
 		return *resource, nil, err
 	}
 
-	resp, _, err := s.client.Do(ctx, req, &resource, false)
+	resp, _, err := s.client.Do(ctx, req, resource, false)
 	if err != nil {
 		return *resource, nil, err
 	}