diff --git a/.gitignore b/.gitignore index df8cb4e..1f6e21e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,3 @@ .idea # Project ignores - -/config.json diff --git a/config.json.dist b/config.json.dist deleted file mode 100644 index 0ed6632..0000000 --- a/config.json.dist +++ /dev/null @@ -1,4 +0,0 @@ -{ - "url": "https://demo.retailcrm.ru", - "key": "111" -} diff --git a/v5/client.go b/v5/client.go index ec371f6..c877619 100644 --- a/v5/client.go +++ b/v5/client.go @@ -4,11 +4,9 @@ import ( "encoding/json" "errors" "fmt" - "github.com/google/go-querystring/query" "io/ioutil" "net/http" "net/url" - "strconv" "strings" "time" ) @@ -18,19 +16,6 @@ const ( unversionedPrefix = "/api" ) -// Client type -type Client struct { - Url string - Key string - httpClient *http.Client -} - -// ErrorResponse type -type ErrorResponse struct { - ErrorMsg string `json:"errorMsg,omitempty"` - Errors map[string]string `json:"errors,omitempty"` -} - // New initalize client func New(url string, key string) *Client { return &Client{ @@ -40,7 +25,7 @@ func New(url string, key string) *Client { } } -func (c *Client) getRequest(urlWithParameters string) ([]byte, int, error) { +func (c *Client) GetRequest(urlWithParameters string) ([]byte, int, error) { var res []byte req, err := http.NewRequest("GET", fmt.Sprintf("%s%s", c.Url, urlWithParameters), nil) @@ -67,7 +52,7 @@ func (c *Client) getRequest(urlWithParameters string) ([]byte, int, error) { return res, resp.StatusCode, nil } -func (c *Client) postRequest(url string, postParams url.Values) ([]byte, int, error) { +func (c *Client) PostRequest(url string, postParams url.Values) ([]byte, int, error) { var res []byte req, err := http.NewRequest( @@ -128,135 +113,3 @@ func checkBy(by string) string { return context } - -// ApiVersions get available API versions -func (c *Client) ApiVersions() (*VersionResponse, int, error) { - var resp VersionResponse - data, status, err := c.getRequest(fmt.Sprintf("%s/api-versions", unversionedPrefix)) - if err != nil { - return &resp, status, err - } - - err = json.Unmarshal(data, &resp) - - return &resp, status, err -} - -// ApiCredentials get available API methods -func (c *Client) ApiCredentials() (*CredentialResponse, int, error) { - var resp CredentialResponse - data, status, err := c.getRequest(fmt.Sprintf("%s/credentials", unversionedPrefix)) - if err != nil { - return &resp, status, err - } - - err = json.Unmarshal(data, &resp) - - return &resp, status, err -} - -// Customer get method -func (c *Client) Customer(id, by, site string) (*CustomerResponse, int, error) { - var resp CustomerResponse - var context = checkBy(by) - - fw := CustomerGetFilter{context, site} - params, _ := query.Values(fw) - data, status, err := c.getRequest(fmt.Sprintf("%s/customers/%s?%s", versionedPrefix, id, params.Encode())) - if err != nil { - return &resp, status, err - } - - err = json.Unmarshal(data, &resp) - - return &resp, status, err -} - -// Customers list method -func (c *Client) Customers(filter CustomersFilter, limit, page int) (*CustomersResponse, int, error) { - var resp CustomersResponse - - if limit == 0 { - limit = 20 - } - - if page == 0 { - page = 1 - } - - fw := CustomersParameters{filter, limit, page} - params, _ := query.Values(fw) - - data, status, err := c.getRequest(fmt.Sprintf("%s/customers?%s", versionedPrefix, params.Encode())) - if err != nil { - return &resp, status, err - } - - err = json.Unmarshal(data, &resp) - - return &resp, status, err -} - -func (c *Client) CustomerCreate(customer Customer, site ...string) (*CustomerChangeResponse, int, error) { - var resp CustomerChangeResponse - customerJson, _ := json.Marshal(&customer) - - p := url.Values{ - "customer": {string(customerJson[:])}, - } - - if len(site) > 0 { - s := site[0] - - if s != "" { - p.Add("site", s) - } - } - - data, status, err := c.postRequest(fmt.Sprintf("%s/customers/create", versionedPrefix), p) - if err != nil { - return &resp, status, err - } - - err = json.Unmarshal(data, &resp) - - return &resp, status, err -} - -func (c *Client) CustomerEdit(customer Customer, by string, site ...string) (*CustomerChangeResponse, int, error) { - var resp CustomerChangeResponse - var uid = strconv.Itoa(customer.Id) - var context = checkBy(by) - - if context == "externalId" { - uid = customer.ExternalId - } - - customerJson, _ := json.Marshal(&customer) - - p := url.Values{ - "by": {string(context)}, - "customer": {string(customerJson[:])}, - } - - if len(site) > 0 { - s := site[0] - - if s != "" { - p.Add("site", s) - } - } - - data, status, err := c.postRequest(fmt.Sprintf("%s/customers/%s/edit", versionedPrefix, uid), p) - if err != nil { - return &resp, status, err - } - - err = json.Unmarshal(data, &resp) - - return &resp, status, err -} - -func (c *Client) CustomersUpload() { - -} diff --git a/v5/methods_api.go b/v5/methods_api.go new file mode 100644 index 0000000..05054c0 --- /dev/null +++ b/v5/methods_api.go @@ -0,0 +1,32 @@ +package v5 + +import ( + "encoding/json" + "fmt" +) + +// ApiVersions get available API versions +func (c *Client) ApiVersions() (*VersionResponse, int, error) { + var resp VersionResponse + data, status, err := c.GetRequest(fmt.Sprintf("%s/api-versions", unversionedPrefix)) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// ApiCredentials get available API methods +func (c *Client) ApiCredentials() (*CredentialResponse, int, error) { + var resp CredentialResponse + data, status, err := c.GetRequest(fmt.Sprintf("%s/credentials", unversionedPrefix)) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} diff --git a/v5/methods_customers.go b/v5/methods_customers.go new file mode 100644 index 0000000..9b57f12 --- /dev/null +++ b/v5/methods_customers.go @@ -0,0 +1,187 @@ +package v5 + +import ( + "encoding/json" + "fmt" + "net/url" + "strconv" + + "github.com/google/go-querystring/query" +) + +// Customer get method +func (c *Client) Customer(id, by, site string) (*CustomerResponse, int, error) { + var resp CustomerResponse + var context = checkBy(by) + + fw := CustomerFilter{context, site} + params, _ := query.Values(fw) + data, status, err := c.GetRequest(fmt.Sprintf("%s/customers/%s?%s", versionedPrefix, id, params.Encode())) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// Customers list method +func (c *Client) Customers(filter CustomersFilter, limit, page int) (*CustomersResponse, int, error) { + var resp CustomersResponse + + if limit == 0 { + limit = 20 + } + + if page == 0 { + page = 1 + } + + fw := CustomersParameters{filter, limit, page} + params, _ := query.Values(fw) + + data, status, err := c.GetRequest(fmt.Sprintf("%s/customers?%s", versionedPrefix, params.Encode())) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// CustomerCreate method +func (c *Client) CustomerCreate(customer Customer, site ...string) (*CustomerChangeResponse, int, error) { + var resp CustomerChangeResponse + customerJson, _ := json.Marshal(&customer) + + p := url.Values{ + "customer": {string(customerJson[:])}, + } + + if len(site) > 0 { + s := site[0] + + if s != "" { + p.Add("site", s) + } + } + + data, status, err := c.PostRequest(fmt.Sprintf("%s/customers/create", versionedPrefix), p) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// CustomerEdit method +func (c *Client) CustomerEdit(customer Customer, by string, site ...string) (*CustomerChangeResponse, int, error) { + var resp CustomerChangeResponse + var uid = strconv.Itoa(customer.Id) + var context = checkBy(by) + + if context == "externalId" { + uid = customer.ExternalId + } + + customerJson, _ := json.Marshal(&customer) + + p := url.Values{ + "by": {string(context)}, + "customer": {string(customerJson[:])}, + } + + if len(site) > 0 { + s := site[0] + + if s != "" { + p.Add("site", s) + } + } + + data, status, err := c.PostRequest(fmt.Sprintf("%s/customers/%s/edit", versionedPrefix, uid), p) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// CustomersUpload method +func (c *Client) CustomersUpload(customers []Customer, site ...string) (*CustomersUploadResponse, int, error) { + var resp CustomersUploadResponse + + uploadJson, _ := json.Marshal(&customers) + + p := url.Values{ + "customers": {string(uploadJson[:])}, + } + + if len(site) > 0 { + s := site[0] + + if s != "" { + p.Add("site", s) + } + } + + data, status, err := c.PostRequest(fmt.Sprintf("%s/customers/upload", versionedPrefix), p) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// CustomersFixExternalIds method +func (c *Client) CustomersFixExternalIds(customers []CustomerIdentifiers) (*SucessfulResponse, int, error) { + var resp SucessfulResponse + + customersJson, _ := json.Marshal(&customers) + + p := url.Values{ + "customers": {string(customersJson[:])}, + } + + data, status, err := c.PostRequest(fmt.Sprintf("%s/customers/fix-external-ids", versionedPrefix), p) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} + +// CustomersHistory method +func (c *Client) CustomersHistory(filter CustomersHistoryFilter, limit, page int) (*CustomersHistoryResponse, int, error) { + var resp CustomersHistoryResponse + + if limit == 0 { + limit = 20 + } + + if page == 0 { + page = 1 + } + + fw := CustomersHistoryParameters{filter, limit, page} + params, _ := query.Values(fw) + + data, status, err := c.GetRequest(fmt.Sprintf("%s/customers/history?%s", versionedPrefix, params.Encode())) + if err != nil { + return &resp, status, err + } + + err = json.Unmarshal(data, &resp) + + return &resp, status, err +} diff --git a/v5/methods_orders.go b/v5/methods_orders.go new file mode 100644 index 0000000..985a541 --- /dev/null +++ b/v5/methods_orders.go @@ -0,0 +1 @@ +package v5 diff --git a/v5/types.go b/v5/types.go deleted file mode 100644 index 05d37e0..0000000 --- a/v5/types.go +++ /dev/null @@ -1,149 +0,0 @@ -package v5 - -// VersionResponse return available API versions -type VersionResponse struct { - Success bool `json:"success,omitempty"` - Versions []string `json:"versions,brackets,omitempty"` -} - -// CredentialResponse return available API methods -type CredentialResponse struct { - Success bool `json:"success,omitempty"` - Credentials []string `json:"credentials,brackets,omitempty"` - SiteAccess string `json:"siteAccess,omitempty"` - SitesAvailable []string `json:"sitesAvailable,brackets,omitempty"` -} - -// Pagination type -type Pagination struct { - Limit int `json:"limit,omitempty"` - TotalCount int `json:"totalCount,omitempty"` - CurrentPage int `json:"currentPage,omitempty"` - TotalPageCount int `json:"totalPageCount,omitempty"` -} - -// Address type -type Address struct { - Index string `json:"index,omitempty"` - CountryIso string `json:"countryIso,omitempty"` - Region string `json:"region,omitempty"` - RegionId int `json:"regionId,omitempty"` - City string `json:"city,omitempty"` - CityId int `json:"cityId,omitempty"` - CityType string `json:"cityType,omitempty"` - Street string `json:"street,omitempty"` - StreetId int `json:"streetId,omitempty"` - StreetType string `json:"streetType,omitempty"` - Building string `json:"building,omitempty"` - Flat string `json:"flat,omitempty"` - IntercomCode string `json:"intercomCode,omitempty"` - Floor int `json:"floor,omitempty"` - Block int `json:"block,omitempty"` - House string `json:"house,omitempty"` - Metro string `json:"metro,omitempty"` - Notes string `json:"notes,omitempty"` - Text string `json:"text,omitempty"` -} - -// Source type -type Source struct { - Source string `json:"source,omitempty"` - Medium string `json:"medium,omitempty"` - Campaign string `json:"campaign,omitempty"` - Keyword string `json:"keyword,omitempty"` - Content string `json:"content,omitempty"` -} - -// Contragent type -type Contragent struct { - ContragentType string `json:"contragentType,omitempty"` - LegalName string `json:"legalName,omitempty"` - LegalAddress string `json:"legalAddress,omitempty"` - INN string `json:"INN,omitempty"` - OKPO string `json:"OKPO,omitempty"` - KPP string `json:"KPP,omitempty"` - OGRN string `json:"OGRN,omitempty"` - OGRNIP string `json:"OGRNIP,omitempty"` - CertificateNumber string `json:"certificateNumber,omitempty"` - CertificateDate string `json:"certificateDate,omitempty"` - BIK string `json:"BIK,omitempty"` - Bank string `json:"bank,omitempty"` - BankAddress string `json:"bankAddress,omitempty"` - CorrAccount string `json:"corrAccount,omitempty"` - BankAccount string `json:"bankAccount,omitempty"` -} - -// Customer type -type Customer struct { - Id int `json:"id,omitempty"` - ExternalId string `json:"externalId,omitempty"` - FirstName string `json:"firstName,omitempty"` - LastName string `json:"lastName,omitempty"` - Patronymic string `json:"patronymic,omitempty"` - Sex string `json:"sex,omitempty"` - Email string `json:"email,omitempty"` - Phones []CustomerPhone `json:"phones,brackets,omitempty"` - Address *Address `json:"address,omitempty"` - CreatedAt string `json:"createdAt,omitempty"` - Birthday string `json:"birthday,omitempty"` - ManagerId int `json:"managerId,omitempty"` - Vip bool `json:"vip,omitempty"` - Bad bool `json:"bad,omitempty"` - Site string `json:"site,omitempty"` - Source *Source `json:"source,omitempty"` - Contragent *Contragent `json:"contragent,omitempty"` - PersonalDiscount float32 `json:"personalDiscount,omitempty"` - CumulativeDiscount float32 `json:"cumulativeDiscount,omitempty"` - DiscountCardNumber string `json:"discountCardNumber,omitempty"` - EmailMarketingUnsubscribedAt string `json:"emailMarketingUnsubscribedAt,omitempty"` - AvgMarginSumm float32 `json:"avgMarginSumm,omitempty"` - MarginSumm float32 `json:"marginSumm,omitempty"` - TotalSumm float32 `json:"totalSumm,omitempty"` - AverageSumm float32 `json:"averageSumm,omitempty"` - OrdersCount int `json:"ordersCount,omitempty"` - CostSumm float32 `json:"costSumm,omitempty"` - MaturationTime int `json:"maturationTime,omitempty"` - FirstClientId string `json:"firstClientId,omitempty"` - LastClientId string `json:"lastClientId,omitempty"` - //CustomFields map[string]string `json:"customFields,omitempty"` -} - -// CustomerPhone type -type CustomerPhone struct { - Number string `json:"number,omitempty"` -} - -// CustomerGetFilter for get customer request -type CustomerGetFilter struct { - By string `url:"by,omitempty"` - Site string `url:"site,omitempty"` -} - -// CustomerResponse type -type CustomerResponse struct { - Success bool `json:"success"` - Customer *Customer `json:"customer,omitempty,brackets"` -} - -type CustomersFilter struct { - ExternalIds []string `url:"externalIds,omitempty,brackets"` - City string `url:"city,omitempty"` -} - -type CustomersParameters struct { - Filter CustomersFilter `url:"filter,omitempty"` - Limit int `url:"limit,omitempty"` - Page int `url:"page,omitempty"` -} - -type CustomersResponse struct { - Success bool `json:"success"` - Pagination *Pagination `json:"pagination,omitempty"` - Customers []Customer `json:"customers,omitempty,brackets"` -} - -type CustomerChangeResponse struct { - Success bool `json:"success"` - Id int `json:"id,omitempty"` - State string `json:"state,omitempty"` -} diff --git a/v5/types_common.go b/v5/types_common.go new file mode 100644 index 0000000..4a1a90f --- /dev/null +++ b/v5/types_common.go @@ -0,0 +1,102 @@ +package v5 + +import "net/http" + +// Client type +type Client struct { + Url string + Key string + httpClient *http.Client +} + +// ErrorResponse type +type ErrorResponse struct { + ErrorMsg string `json:"errorMsg,omitempty"` + Errors map[string]string `json:"errors,omitempty"` +} + +// SucessfulResponse type +type SucessfulResponse struct { + Success bool `json:"success,omitempty"` +} + +// VersionResponse return available API versions +type VersionResponse struct { + Success bool `json:"success,omitempty"` + Versions []string `json:"versions,brackets,omitempty"` +} + +// CredentialResponse return available API methods +type CredentialResponse struct { + Success bool `json:"success,omitempty"` + Credentials []string `json:"credentials,brackets,omitempty"` + SiteAccess string `json:"siteAccess,omitempty"` + SitesAvailable []string `json:"sitesAvailable,brackets,omitempty"` +} + +// Pagination type +type Pagination struct { + Limit int `json:"limit,omitempty"` + TotalCount int `json:"totalCount,omitempty"` + CurrentPage int `json:"currentPage,omitempty"` + TotalPageCount int `json:"totalPageCount,omitempty"` +} + +// Address type +type Address struct { + Index string `json:"index,omitempty"` + CountryIso string `json:"countryIso,omitempty"` + Region string `json:"region,omitempty"` + RegionId int `json:"regionId,omitempty"` + City string `json:"city,omitempty"` + CityId int `json:"cityId,omitempty"` + CityType string `json:"cityType,omitempty"` + Street string `json:"street,omitempty"` + StreetId int `json:"streetId,omitempty"` + StreetType string `json:"streetType,omitempty"` + Building string `json:"building,omitempty"` + Flat string `json:"flat,omitempty"` + IntercomCode string `json:"intercomCode,omitempty"` + Floor int `json:"floor,omitempty"` + Block int `json:"block,omitempty"` + House string `json:"house,omitempty"` + Metro string `json:"metro,omitempty"` + Notes string `json:"notes,omitempty"` + Text string `json:"text,omitempty"` +} + +// Source type +type Source struct { + Source string `json:"source,omitempty"` + Medium string `json:"medium,omitempty"` + Campaign string `json:"campaign,omitempty"` + Keyword string `json:"keyword,omitempty"` + Content string `json:"content,omitempty"` +} + +// Contragent type +type Contragent struct { + ContragentType string `json:"contragentType,omitempty"` + LegalName string `json:"legalName,omitempty"` + LegalAddress string `json:"legalAddress,omitempty"` + INN string `json:"INN,omitempty"` + OKPO string `json:"OKPO,omitempty"` + KPP string `json:"KPP,omitempty"` + OGRN string `json:"OGRN,omitempty"` + OGRNIP string `json:"OGRNIP,omitempty"` + CertificateNumber string `json:"certificateNumber,omitempty"` + CertificateDate string `json:"certificateDate,omitempty"` + BIK string `json:"BIK,omitempty"` + Bank string `json:"bank,omitempty"` + BankAddress string `json:"bankAddress,omitempty"` + CorrAccount string `json:"corrAccount,omitempty"` + BankAccount string `json:"bankAccount,omitempty"` +} + +type ApiKey struct { + Current bool `json:"current,omitempty"` +} + +type User struct { + Id int `json:"id,omitempty"` +} diff --git a/v5/types_customers.go b/v5/types_customers.go new file mode 100644 index 0000000..3486e48 --- /dev/null +++ b/v5/types_customers.go @@ -0,0 +1,126 @@ +package v5 + +// Customer type +type Customer struct { + Id int `json:"id,omitempty"` + ExternalId string `json:"externalId,omitempty"` + FirstName string `json:"firstName,omitempty"` + LastName string `json:"lastName,omitempty"` + Patronymic string `json:"patronymic,omitempty"` + Sex string `json:"sex,omitempty"` + Email string `json:"email,omitempty"` + Phones []CustomerPhone `json:"phones,brackets,omitempty"` + Address *Address `json:"address,omitempty"` + CreatedAt string `json:"createdAt,omitempty"` + Birthday string `json:"birthday,omitempty"` + ManagerId int `json:"managerId,omitempty"` + Vip bool `json:"vip,omitempty"` + Bad bool `json:"bad,omitempty"` + Site string `json:"site,omitempty"` + Source *Source `json:"source,omitempty"` + Contragent *Contragent `json:"contragent,omitempty"` + PersonalDiscount float32 `json:"personalDiscount,omitempty"` + CumulativeDiscount float32 `json:"cumulativeDiscount,omitempty"` + DiscountCardNumber string `json:"discountCardNumber,omitempty"` + EmailMarketingUnsubscribedAt string `json:"emailMarketingUnsubscribedAt,omitempty"` + AvgMarginSumm float32 `json:"avgMarginSumm,omitempty"` + MarginSumm float32 `json:"marginSumm,omitempty"` + TotalSumm float32 `json:"totalSumm,omitempty"` + AverageSumm float32 `json:"averageSumm,omitempty"` + OrdersCount int `json:"ordersCount,omitempty"` + CostSumm float32 `json:"costSumm,omitempty"` + MaturationTime int `json:"maturationTime,omitempty"` + FirstClientId string `json:"firstClientId,omitempty"` + LastClientId string `json:"lastClientId,omitempty"` + //CustomFields map[string]string `json:"customFields,omitempty"` +} + +// CustomerPhone type +type CustomerPhone struct { + Number string `json:"number,omitempty"` +} + +// CustomerIdentifiers type +type CustomerIdentifiers struct { + Id int `json:"id,omitempty"` + ExternalId string `json:"externalId,omitempty"` +} + +// CustomerHistoryRecord type +type CustomerHistoryRecord struct { + Id int `json:"id,omitempty"` + CreatedAt string `json:"createdAt,omitempty"` + Created bool `json:"created,omitempty"` + Deleted bool `json:"deleted,omitempty"` + Source string `json:"source,omitempty"` + Field string `json:"field,omitempty"` + User *User `json:"user,omitempty,brackets"` + ApiKey *ApiKey `json:"apiKey,omitempty,brackets"` + Customer *Customer `json:"customer,omitempty,brackets"` +} + +// CustomerFilter for get customer request +type CustomerFilter struct { + By string `url:"by,omitempty"` + Site string `url:"site,omitempty"` +} + +// CustomerResponse type +type CustomerResponse struct { + Success bool `json:"success"` + Customer *Customer `json:"customer,omitempty,brackets"` +} + +type CustomersFilter struct { + ExternalIds []string `url:"externalIds,omitempty,brackets"` + City string `url:"city,omitempty"` +} + +type CustomersParameters struct { + Filter CustomersFilter `url:"filter,omitempty"` + Limit int `url:"limit,omitempty"` + Page int `url:"page,omitempty"` +} + +type CustomersResponse struct { + Success bool `json:"success"` + Pagination *Pagination `json:"pagination,omitempty"` + Customers []Customer `json:"customers,omitempty,brackets"` +} + +type CustomerChangeResponse struct { + Success bool `json:"success"` + Id int `json:"id,omitempty"` + State string `json:"state,omitempty"` +} + +type CustomersUploadParameters struct { + Customers []Customer `url:"customers,omitempty,brackets"` + Site string `url:"site,omitempty"` +} + +type CustomersUploadResponse struct { + Success bool `json:"success"` + UploadedCustomers []CustomerIdentifiers `json:"uploadedCustomers,omitempty,brackets"` +} + +type CustomersHistoryFilter struct { + CustomerId int `url:"customerId,omitempty"` + SinceId int `url:"sinceId,omitempty"` + CustomerExternalId string `url:"customerExternalId,omitempty"` + StartDate string `url:"startDate,omitempty"` + EndDate string `url:"endDate,omitempty"` +} + +type CustomersHistoryParameters struct { + Filter CustomersHistoryFilter `url:"filter,omitempty"` + Limit int `url:"limit,omitempty"` + Page int `url:"page,omitempty"` +} + +type CustomersHistoryResponse struct { + Success bool `json:"success,omitempty"` + GeneratedAt string `json:"generatedAt,omitempty"` + History []CustomerHistoryRecord `json:"history,omitempty,brackets"` + Pagination *Pagination `json:"pagination,omitempty"` +} diff --git a/v5/types_orders.go b/v5/types_orders.go new file mode 100644 index 0000000..e477acb --- /dev/null +++ b/v5/types_orders.go @@ -0,0 +1,52 @@ +package v5 + +// Order type +type Order struct { + Id int `json:"id,omitempty"` + ExternalId string `json:"externalId,omitempty"` + Number string `json:"number,omitempty"` + FirstName string `json:"firstName,omitempty"` + LastName string `json:"lastName,omitempty"` + Patronymic string `json:"patronymic,omitempty"` + Email string `json:"email,omitempty"` + Phone string `json:"phone,omitempty"` + AdditionalPhone string `json:"additionalPhone,omitempty"` + CreatedAt string `json:"createdAt,omitempty"` + StatusUpdatedAt string `json:"statusUpdatedAt,omitempty"` + ManagerId int `json:"managerId,omitempty"` + Mark int `json:"mark,omitempty"` + Call bool `json:"call,omitempty"` + Expired bool `json:"expired,omitempty"` + FromApi bool `json:"fromApi,omitempty"` + MarkDatetime string `json:"markDatetime,omitempty"` + CustomerComment string `json:"customerComment,omitempty"` + ManagerComment string `json:"managerComment,omitempty"` + Status string `json:"status,omitempty"` + StatusComment string `json:"statusComment,omitempty"` + FullPaidAt string `json:"fullPaidAt,omitempty"` + Site string `json:"site,omitempty"` + OrderType string `json:"orderType,omitempty"` + OrderMethod string `json:"orderMethod,omitempty"` + CountryIso string `json:"countryIso,omitempty"` + Summ float32 `json:"summ,omitempty"` + TotalSumm float32 `json:"totalSumm,omitempty"` + PrepaySum float32 `json:"prepaySum,omitempty"` + PurchaseSumm float32 `json:"purchaseSumm,omitempty"` + Weight float32 `json:"weight,omitempty"` + Length int `json:"length,omitempty"` + Width int `json:"width,omitempty"` + Height int `json:"height,omitempty"` + ShipmentStore string `json:"shipmentStore,omitempty"` + ShipmentDate string `json:"shipmentDate,omitempty"` + ClientId string `json:"clientId,omitempty"` + Shipped bool `json:"shipped,omitempty"` + UploadedToExternalStoreSystem bool `json:"uploadedToExternalStoreSystem,omitempty"` + + Source *Source `json:"source,omitempty"` + Contragent *Contragent `json:"contragent,omitempty"` + Customer *Customer `json:"customer,omitempty"` + Delivery *OrderDelivery `json:"delivery,omitempty"` + Marketplace *OrderMarketplace `json:"marketplace,omitempty"` + Items []OrderItem `json:"items,omitempty"` + Payments []OrderPayments `json:"payments,omitempty"` +} diff --git a/v5_tests/base_test.go b/v5_tests/base_test.go new file mode 100644 index 0000000..a06c526 --- /dev/null +++ b/v5_tests/base_test.go @@ -0,0 +1,96 @@ +package v5_tests + +import ( + "math/rand" + "net/http" + "net/url" + "os" + "testing" + "time" + + "github.com/retailcrm/api-client-go/v5" +) + +type Configuration struct { + Url string `json:"url"` + Key string `json:"key"` +} + +func buildConfiguration() *Configuration { + return &Configuration{ + os.Getenv("RETAILCRM_URL"), + os.Getenv("RETAILCRM_KEY"), + } +} + +var r *rand.Rand // Rand for this package. + +func init() { + r = rand.New(rand.NewSource(time.Now().UnixNano())) +} + +func RandomString(strlen int) string { + const chars = "abcdefghijklmnopqrstuvwxyz0123456789" + result := make([]byte, strlen) + + for i := range result { + result[i] = chars[r.Intn(len(chars))] + } + + return string(result) +} + +func client() *v5.Client { + configuration := buildConfiguration() + return v5.New(configuration.Url, configuration.Key) +} + +func TestGetRequest(t *testing.T) { + c := client() + _, status, _ := c.GetRequest("/fake-method") + + if status != http.StatusNotFound { + t.Fail() + } +} + +func TestPostRequest(t *testing.T) { + c := client() + _, status, _ := c.PostRequest("/fake-method", url.Values{}) + + if status != http.StatusNotFound { + t.Fail() + } +} + +func TestClient_ApiVersionsVersions(t *testing.T) { + c := client() + data, status, err := c.ApiVersions() + if err != nil { + t.Fail() + } + + if status >= http.StatusBadRequest { + t.Fail() + } + + if data.Success != true { + t.Fail() + } +} + +func TestClient_ApiCredentialsCredentials(t *testing.T) { + c := client() + data, status, err := c.ApiCredentials() + if err != nil { + t.Fail() + } + + if status >= http.StatusBadRequest { + t.Fail() + } + + if data.Success != true { + t.Fail() + } +} diff --git a/v5/client_test.go b/v5_tests/customers_test.go similarity index 52% rename from v5/client_test.go rename to v5_tests/customers_test.go index c16a600..61418c4 100644 --- a/v5/client_test.go +++ b/v5_tests/customers_test.go @@ -1,113 +1,17 @@ -package v5 +package v5_tests import ( - "encoding/json" "fmt" - "math/rand" "net/http" - "net/url" - "os" "testing" "time" + + "github.com/retailcrm/api-client-go/v5" ) -type Configuration struct { - Url string `json:"url"` - Key string `json:"key"` - Ver string `json:"version"` -} - -func buildConfiguration() *Configuration { - file, _ := os.Open("../config.json") - decoder := json.NewDecoder(file) - configuration := Configuration{} - err := decoder.Decode(&configuration) - if err != nil { - fmt.Println("error:", err) - } - - return &Configuration{ - configuration.Url, - configuration.Key, - configuration.Ver, - } -} - -var r *rand.Rand // Rand for this package. - -func init() { - r = rand.New(rand.NewSource(time.Now().UnixNano())) -} - -func RandomString(strlen int) string { - const chars = "abcdefghijklmnopqrstuvwxyz0123456789" - result := make([]byte, strlen) - - for i := range result { - result[i] = chars[r.Intn(len(chars))] - } - - return string(result) -} - -func client() *Client { - configuration := buildConfiguration() - return New(configuration.Url, configuration.Key) -} - -func TestGetRequest(t *testing.T) { - c := client() - _, status, _ := c.getRequest("/fake-method") - - if status != http.StatusNotFound { - t.Fail() - } -} - -func TestPostRequest(t *testing.T) { - c := client() - _, status, _ := c.postRequest("/fake-method", url.Values{}) - - if status != http.StatusNotFound { - t.Fail() - } -} - -func TestClient_ApiVersionsVersions(t *testing.T) { - c := client() - data, status, err := c.ApiVersions() - if err != nil { - t.Fail() - } - - if status >= http.StatusBadRequest { - t.Fail() - } - - if data.Success != true { - t.Fail() - } -} - -func TestClient_ApiCredentialsCredentials(t *testing.T) { - c := client() - data, status, err := c.ApiCredentials() - if err != nil { - t.Fail() - } - - if status >= http.StatusBadRequest { - t.Fail() - } - - if data.Success != true { - t.Fail() - } -} - func TestClient_CustomersCustomers(t *testing.T) { c := client() - f := CustomersFilter{} + f := v5.CustomersFilter{} f.City = "Москва" data, status, err := c.Customers(f, 20, 1) @@ -129,7 +33,7 @@ func TestClient_CustomersCustomers(t *testing.T) { func TestClient_CustomerChange(t *testing.T) { c := client() - f := Customer{} + f := v5.Customer{} random := RandomString(8) @@ -195,3 +99,107 @@ func TestClient_CustomerChange(t *testing.T) { t.Fail() } } + +func TestClient_CustomersUpload(t *testing.T) { + c := client() + customers := make([]v5.Customer, 3) + + for i := range customers { + customers[i] = v5.Customer{ + FirstName: fmt.Sprintf("Name_%s", RandomString(8)), + LastName: fmt.Sprintf("Test_%s", RandomString(8)), + ExternalId: RandomString(8), + Email: fmt.Sprintf("%s@example.com", RandomString(8)), + } + } + + data, status, err := c.CustomersUpload(customers) + if err != nil { + t.Errorf("%s", err) + t.Fail() + } + + if status >= http.StatusBadRequest { + t.Errorf("%s", err) + t.Fail() + } + + if data.Success != true { + t.Errorf("%s", err) + t.Fail() + } +} + +func TestClient_CustomersFixExternalIds(t *testing.T) { + c := client() + f := v5.Customer{ + FirstName: fmt.Sprintf("Name_%s", RandomString(8)), + LastName: fmt.Sprintf("Test_%s", RandomString(8)), + ExternalId: RandomString(8), + Email: fmt.Sprintf("%s@example.com", RandomString(8)), + } + + cr, sc, err := c.CustomerCreate(f) + if err != nil { + t.Errorf("%s", sc) + t.Fail() + } + + if sc != http.StatusCreated { + t.Errorf("%s", sc) + t.Fail() + } + + if cr.Success != true { + t.Errorf("%s", sc) + t.Fail() + } + + customers := []v5.CustomerIdentifiers{{ + Id: cr.Id, + ExternalId: RandomString(8), + }} + + fx, fe, err := c.CustomersFixExternalIds(customers) + if err != nil { + t.Errorf("%s", err) + t.Fail() + } + + if fe != http.StatusOK { + t.Errorf("%s", err) + t.Fail() + } + + if fx.Success != true { + t.Errorf("%s", err) + t.Fail() + } +} + +func TestClient_CustomersHistory(t *testing.T) { + c := client() + f := v5.CustomersHistoryFilter{} + f.StartDate = time.Now().Add(-96 * time.Hour).Format("2006-01-02 15:04:05") + + data, status, err := c.CustomersHistory(f, 20, 1) + if err != nil { + t.Errorf("%s", err) + t.Fail() + } + + if status >= http.StatusBadRequest { + t.Errorf("%s", err) + t.Fail() + } + + if data.Success != true { + t.Errorf("%s", err) + t.Fail() + } + + if len(data.History) == 0 { + t.Errorf("%s", err) + t.Fail() + } +}