Skip to content

Feature/add logrus logging #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RuNpiXelruN wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Feature/add logrus logging #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b986a02
Added composite requests to API methods; P.S. the contactID in the te…
TomSED Sep 4, 2018
e0c5c8a
Added Composite Requests
TomSED Sep 5, 2018
b14dd4a
Add 'Manual' methods for populating apiResources and apiSObjects
justasitsounds Sep 5, 2018
fe58c98
Merge branch 'master' into feature/optimise-startup
justasitsounds Sep 5, 2018
a31be03
Add tests for SetAPIResources and SetAPIObjects methods
justasitsounds Sep 5, 2018
7f5c44d
Merge pull request #1 from SocietyOne/feature/optimise-startup
TomSED Sep 5, 2018
3feb13b
Added unmarshal test, CompositeResponse body now unmarshals into its …
TomSED Sep 6, 2018
5ec2277
Add logrus logging to force api
RuNpiXelruN Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,6 @@ func main() {
Documentation
=======

* [Package Reference](http://godoc.org/github.com/SocietyOne/go-force/force)
* [Package Reference](http://godoc.org/github.com/nimajalali/go-force/force)
* [Force.com API Reference](http://www.salesforce.com/us/developer/docs/api_rest/)
41 changes: 41 additions & 0 deletions force/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package force

import (
"encoding/json"
"errors"
"fmt"
"io"
)

const (
Expand All @@ -11,6 +14,7 @@ const (
sObjectsKey = "sobjects"
sObjectKey = "sobject"
sObjectDescribeKey = "describe"
compositeKey = "composite"

rowTemplateKey = "rowTemplate"
idKey = "{ID}"
Expand Down Expand Up @@ -182,6 +186,7 @@ func (forceApi *ForceApi) getApiSObjects() error {
list := &SObjectApiResponse{}
err := forceApi.Get(uri, nil, list)
if err != nil {
log.Debugf("Error returned from: forceApi.Get in getApiSObjects() func: %v\n", err)
return err
}

Expand All @@ -202,6 +207,7 @@ func (forceApi *ForceApi) getApiSObjectDescriptions() error {
desc := &SObjectDescription{}
err := forceApi.Get(uri, nil, desc)
if err != nil {
log.Debugf("Error returned from: forceApi.Get in getApiSObjectDescriptions() func: %v\n", err)
return err
}

Expand Down Expand Up @@ -230,9 +236,44 @@ func (forceApi *ForceApi) RefreshToken() error {

err := forceApi.Post("/services/oauth2/token", nil, payload, res)
if err != nil {
log.Debugf("Error returned from: forceApi.Post in RefreshToken() func: %v\n", err)
return err
}

forceApi.oauth.AccessToken = res.AccessToken
return nil
}

//SetAPIResources populates the forceApi.apiResources
func (forceApi *ForceApi) SetAPIResources(src io.Reader) error {
if src == nil {
log.Debug("Error: io.Reader is nil, in SetAPIResources()")
return errors.New("io.Reader is nil")
}
dec := json.NewDecoder(src)
return dec.Decode(&forceApi.apiResources)
}

//SetAPISObjects populates forceAPi.apiSObjects manually
func (forceApi *ForceApi) SetAPISObjects(src io.Reader) error {

if src == nil {
log.Debug("Error: io.Reader is nil, in SetAPIResources()")
return errors.New("io.Reader is nil")
}
dec := json.NewDecoder(src)
list := &SObjectApiResponse{}
err := dec.Decode(list)
if err != nil {
log.Debugf("Error returned from: dec.Decode in SetAPISObjects() func: %v\n", err)
return err
}

forceApi.apiMaxBatchSize = list.MaxBatchSize

for _, object := range list.SObjects {
forceApi.apiSObjects[object.Name] = object
}

return nil
}
300 changes: 300 additions & 0 deletions force/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,300 @@
package force

import (
"bytes"
"io"
"testing"
)

func TestForceApi_SetAPIResources(t *testing.T) {

reader := bytes.NewBufferString(`{
"tooling": "/services/data/v43.0/tooling",
"metadata": "/services/data/v43.0/metadata",
"folders": "/services/data/v43.0/folders",
"eclair": "/services/data/v43.0/eclair",
"prechatForms": "/services/data/v43.0/prechatForms",
"chatter": "/services/data/v43.0/chatter"
}`)

type fields struct {
apiResources map[string]string
}
type args struct {
src io.Reader
}
tests := []struct {
name string
fields fields
args args
wantErr bool
}{
{
name: "setResources",
fields: fields{
apiResources: map[string]string{
"tooling": "/services/data/v43.0/tooling",
"metadata": "/services/data/v43.0/metadata",
"folders": "/services/data/v43.0/folders",
"eclair": "/services/data/v43.0/eclair",
"prechatForms": "/services/data/v43.0/prechatForms",
"chatter": "/services/data/v43.0/chatter",
},
},
args: args{
src: reader,
},
wantErr: false,
},
{
name: "setResources nil reader",
fields: fields{
apiResources: map[string]string{},
},
args: args{
src: nil,
},
wantErr: true,
},
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
forceApi := &ForceApi{
apiResources: make(map[string]string),
apiSObjects: make(map[string]*SObjectMetaData),
}
if err := forceApi.SetAPIResources(tt.args.src); (err != nil) != tt.wantErr {
t.Errorf("ForceApi.SetAPIResources() error = %v, wantErr %v", err, tt.wantErr)
}
if len(tt.fields.apiResources) != len(forceApi.apiResources) {
t.Errorf("forceAPI.apiResources length not as expected, wanted: %v, but got: %v", len(forceApi.apiResources), len(tt.fields.apiResources))
}
for k, v := range tt.fields.apiResources {
actual, exists := forceApi.apiResources[k]
if !exists {
t.Errorf("Key:%s does not exist in forceApi.apiResources", k)
}
if actual != v {
t.Errorf("Expected value:%s to be associated with key:%s in apiResources. but got: %s instead", v, k, actual)
}
}
})
}
}

func TestForceApi_SetAPISObjects(t *testing.T) {
reader := bytes.NewBufferString(validSObjects)
type fields struct {
apiSObjects map[string]*SObjectMetaData
apiMaxBatchSize int64
}
type args struct {
src io.Reader
}
tests := []struct {
name string
fields fields
args args
wantErr bool
}{
{
name: "setApiObjects",
fields: fields{
apiSObjects: map[string]*SObjectMetaData{
"Applications__c": &SObjectMetaData{},
"Contact": &SObjectMetaData{},
"Liability__c": &SObjectMetaData{},
"Other_Income__c": &SObjectMetaData{},
},
apiMaxBatchSize: 200,
},
args: args{
src: reader,
},
wantErr: false,
},
{
name: "setApiObjects",
fields: fields{
apiSObjects: map[string]*SObjectMetaData{},
apiMaxBatchSize: 0,
},
args: args{
src: bytes.NewBufferString("{\"malformed\"}"),
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
forceApi := &ForceApi{
apiResources: make(map[string]string),
apiSObjects: make(map[string]*SObjectMetaData),
}
if err := forceApi.SetAPISObjects(tt.args.src); (err != nil) != tt.wantErr {
t.Errorf("ForceApi.SetAPISObjects() error = %v, wantErr %v", err, tt.wantErr)
}
if tt.fields.apiMaxBatchSize != forceApi.apiMaxBatchSize {
t.Errorf("Expected ForceApi.apiMaxbatchSize to equal: %v, but got: %v", tt.fields.apiMaxBatchSize, forceApi.apiMaxBatchSize)
}
if len(tt.fields.apiSObjects) != len(forceApi.apiSObjects) {
t.Errorf("Expected ForceApi.apiSObjects to have length: %v, but got: %v", len(tt.fields.apiSObjects), len(forceApi.apiSObjects))
}
for k := range tt.fields.apiSObjects {
_, exists := forceApi.apiSObjects[k]
if !exists {
t.Errorf("Expected forceApi.Sobjects to have key:%v", k)
}
}
})
}
}

const validSObjects = `{
"encoding": "UTF-8",
"maxBatchSize": 200,
"sobjects": [
{
"activateable": false,
"createable": true,
"custom": true,
"customSetting": false,
"deletable": true,
"deprecatedAndHidden": false,
"feedEnabled": false,
"hasSubtypes": false,
"isSubtype": false,
"keyPrefix": "a0u",
"label": "CM Application",
"labelPlural": "CM Applications",
"layoutable": true,
"mergeable": false,
"mruEnabled": true,
"name": "Applications__c",
"queryable": true,
"replicateable": true,
"retrieveable": true,
"searchable": true,
"triggerable": true,
"undeletable": true,
"updateable": true,
"urls": {
"compactLayouts": "/services/data/v43.0/sobjects/Applications__c/describe/compactLayouts",
"rowTemplate": "/services/data/v43.0/sobjects/Applications__c/{ID}",
"approvalLayouts": "/services/data/v43.0/sobjects/Applications__c/describe/approvalLayouts",
"defaultValues": "/services/data/v43.0/sobjects/Applications__c/defaultValues?recordTypeId&fields",
"describe": "/services/data/v43.0/sobjects/Applications__c/describe",
"quickActions": "/services/data/v43.0/sobjects/Applications__c/quickActions",
"layouts": "/services/data/v43.0/sobjects/Applications__c/describe/layouts",
"sobject": "/services/data/v43.0/sobjects/Applications__c"
}
},
{
"activateable": false,
"createable": true,
"custom": false,
"customSetting": false,
"deletable": true,
"deprecatedAndHidden": false,
"feedEnabled": true,
"hasSubtypes": false,
"isSubtype": false,
"keyPrefix": "003",
"label": "Contact",
"labelPlural": "Contacts",
"layoutable": true,
"mergeable": true,
"mruEnabled": true,
"name": "Contact",
"queryable": true,
"replicateable": true,
"retrieveable": true,
"searchable": true,
"triggerable": true,
"undeletable": true,
"updateable": true,
"urls": {
"compactLayouts": "/services/data/v43.0/sobjects/Contact/describe/compactLayouts",
"rowTemplate": "/services/data/v43.0/sobjects/Contact/{ID}",
"approvalLayouts": "/services/data/v43.0/sobjects/Contact/describe/approvalLayouts",
"defaultValues": "/services/data/v43.0/sobjects/Contact/defaultValues?recordTypeId&fields",
"listviews": "/services/data/v43.0/sobjects/Contact/listviews",
"describe": "/services/data/v43.0/sobjects/Contact/describe",
"quickActions": "/services/data/v43.0/sobjects/Contact/quickActions",
"layouts": "/services/data/v43.0/sobjects/Contact/describe/layouts",
"sobject": "/services/data/v43.0/sobjects/Contact"
}
},
{
"activateable": false,
"createable": true,
"custom": true,
"customSetting": false,
"deletable": true,
"deprecatedAndHidden": false,
"feedEnabled": false,
"hasSubtypes": false,
"isSubtype": false,
"keyPrefix": "aCl",
"label": "Liability",
"labelPlural": "Liabilities",
"layoutable": true,
"mergeable": false,
"mruEnabled": false,
"name": "Liability__c",
"queryable": true,
"replicateable": true,
"retrieveable": true,
"searchable": true,
"triggerable": true,
"undeletable": true,
"updateable": true,
"urls": {
"compactLayouts": "/services/data/v43.0/sobjects/Liability__c/describe/compactLayouts",
"rowTemplate": "/services/data/v43.0/sobjects/Liability__c/{ID}",
"approvalLayouts": "/services/data/v43.0/sobjects/Liability__c/describe/approvalLayouts",
"defaultValues": "/services/data/v43.0/sobjects/Liability__c/defaultValues?recordTypeId&fields",
"describe": "/services/data/v43.0/sobjects/Liability__c/describe",
"quickActions": "/services/data/v43.0/sobjects/Liability__c/quickActions",
"layouts": "/services/data/v43.0/sobjects/Liability__c/describe/layouts",
"sobject": "/services/data/v43.0/sobjects/Liability__c"
}
},
{
"activateable": false,
"createable": true,
"custom": true,
"customSetting": false,
"deletable": true,
"deprecatedAndHidden": false,
"feedEnabled": false,
"hasSubtypes": false,
"isSubtype": false,
"keyPrefix": "aCm",
"label": "Other Income",
"labelPlural": "Other Income",
"layoutable": true,
"mergeable": false,
"mruEnabled": false,
"name": "Other_Income__c",
"queryable": true,
"replicateable": true,
"retrieveable": true,
"searchable": true,
"triggerable": true,
"undeletable": true,
"updateable": true,
"urls": {
"compactLayouts": "/services/data/v43.0/sobjects/Other_Income__c/describe/compactLayouts",
"rowTemplate": "/services/data/v43.0/sobjects/Other_Income__c/{ID}",
"approvalLayouts": "/services/data/v43.0/sobjects/Other_Income__c/describe/approvalLayouts",
"defaultValues": "/services/data/v43.0/sobjects/Other_Income__c/defaultValues?recordTypeId&fields",
"describe": "/services/data/v43.0/sobjects/Other_Income__c/describe",
"quickActions": "/services/data/v43.0/sobjects/Other_Income__c/quickActions",
"layouts": "/services/data/v43.0/sobjects/Other_Income__c/describe/layouts",
"sobject": "/services/data/v43.0/sobjects/Other_Income__c"
}
}
]
}`
Loading