Merge pull request #55 from tada-team/tariff-correction

Tariff correction

billing_tariff.go

@@ -2,46 +2,82 @@ package tdproto
 
 import "time"
 
-// TariffStatus is status of tariff
-type TariffStatus string
+// TariffBilling struct of billing api
+type TariffBilling struct {
+	// Date of closing tariff
+	CloseDate *time.Time `json:"close_date,omitempty"`
 
-const (
-	// ActiveTariff is active tariff status
-	ActiveTariff TariffStatus = "Active"
+	// Cost of one workplace
+	CostWorkplace string `json:"cost_workplace"`
 
-	// ArchiveTariff is archive tariff status
-	ArchiveTariff TariffStatus = "Archive"
-)
+	// Currency of tariff
+	Currency Currency `json:"currency"`
 
-// TariffBilling struct of billing api
-type TariffBilling struct {
+	// Disk space limit per user
+	DiskSpaceQuota string `json:"disk_space_quota"`
+
+	// Count of free workspaces
+	FreeWorkplace int32 `json:"free_workplace"`
+
+	// Flag of availability of free seats when exceeding FreeWorkplace
+	IsBillingFree bool `json:"billing_free"`
+
+	// Flag of accounting without looking at the number of days before the billing period
+	IsBillingFullTime bool `json:"billing_full_time"`
+
+	// Default tariff flag that is set when registering an account
+	IsDefaultTariff bool `json:"default_tariff"`
+
+	// Flag for accounting for unspent days when switching to a new tariff
+	IsRecalcChangeTariff bool `json:"recalc_change_tariff"`
+
+	// Maximum count of users in voice conference
+	MaxVoiceUser int32 `json:"max_voice_user"`
+
+	// Maximum count of users in video conference
+	MaxVideoUser int32 `json:"max_video_user"`
+
+	// Date of opening tariff
+	OpenDate *time.Time `json:"open_date"`
+
+	// Number of paid days
+	PeriodDays int32 `json:"period_days"`
+
+	// Status of tariff
+	Status TariffStatus `json:"status"`
 
 	// Tariff id
-	TariffId int64 `json:"tariff_id,omitempty"`
+	TariffId int64 `json:"tariff_id"`
 
 	// Name of tariff
-	TariffName string `json:"tariff_name,omitempty"`
+	TariffName string `json:"tariff_name"`
+}
 
-	// Count of free workspaces
-	FreeWorkplace int32 `json:"free_workplace,omitempty"`
+// CreateTariffRequest request on create tariff
+type CreateTariffRequest struct {
+	// Date of closing tariff
+	CloseDate *time.Time `json:"close_date,omitempty"`
+
+	// Cost of one workplace
+	CostWorkplace string `json:"cost_workplace,omitempty"`
+
+	// Currency of tariff
+	Currency Currency `json:"currency"`
 
 	// Disk space limit per user
 	DiskSpaceQuota string `json:"disk_space_quota,omitempty"`
 
+	// Count of free workspaces
+	FreeWorkplace int32 `json:"free_workplace,omitempty"`
+
 	// Flag of availability of free seats when exceeding FreeWorkplace
 	IsBillingFree bool `json:"billing_free,omitempty"`
 
 	// Flag of accounting without looking at the number of days before the billing period
 	IsBillingFullTime bool `json:"billing_full_time,omitempty"`
 
-	// Number of paid days
-	PeriodDays int32 `json:"period_days,omitempty"`
-
-	// Cost of one workplace
-	CostWorkplace string `json:"cost_workplace,omitempty"`
-
-	// Currency of tariff in ISO
-	Currency string `json:"currency,omitempty"`
+	// Default tariff flag that is set when registering an account
+	IsDefaultTariff bool `json:"default_tariff,omitempty"`
 
 	// Flag for accounting for unspent days when switching to a new tariff
 	IsRecalcChangeTariff bool `json:"recalc_change_tariff,omitempty"`
@@ -52,37 +88,14 @@ type TariffBilling struct {
 	// Maximum count of users in video conference
 	MaxVideoUser int32 `json:"max_video_user,omitempty"`
 
-	// Default tariff flag that is set when registering an account
-	IsDefaultTariff bool `json:"default_tariff,omitempty"`
-
 	// Date of opening tariff
 	OpenDate *time.Time `json:"open_date,omitempty"`
 
-	// Date of closing tariff
-	CloseDate *time.Time `json:"close_date,omitempty"`
-
-	// Status of tariff
-	Status TariffStatus `json:"status,omitempty"`
-}
-
-// CreateTariffRequest request on create tariff
-type CreateTariffRequest struct {
-	TariffBilling
-}
-
-// CreateTariffResponse response on create tariff
-type CreateTariffResponse struct {
-	TariffBilling
-}
-
-// GetTariffByIdRequest request on get tariff by ID
-type GetTariffByIdRequest struct {
-	Id int64 `json:"id,omitempty"`
-}
+	// Number of paid days
+	PeriodDays int32 `json:"period_days"`
 
-// GetTariffByIdResponse response on get tariff by ID
-type GetTariffByIdResponse struct {
-	TariffBilling
+	// Name of tariff
+	TariffName string `json:"tariff_name"`
 }
 
 // GetTariffsListResponse response on get tariffs list
@@ -97,7 +110,6 @@ type GetActiveTariffsListResponse struct {
 
 // CloseTariffRequest request on close(archive) tariff
 type CloseTariffRequest struct {
-	TariffId  int64     `json:"tariff_id,omitempty"`
 	CloseDate time.Time `json:"close_date,omitempty"`
 }
 
@@ -106,11 +118,6 @@ type CloseTariffResponse struct {
 	Success bool `json:"success"`
 }
 
-// SetTariffAsDefaultRequest request on set tariff as default
-type SetTariffAsDefaultRequest struct {
-	TariffId int64 `json:"tariff_id,omitempty"`
-}
-
 // SetTariffAsDefaultResponse response on set tariff as default
 type SetTariffAsDefaultResponse struct {
 	Success bool `json:"success"`

currency.go

@@ -0,0 +1,15 @@
+package tdproto
+
+// ISO 4217 currency code
+type Currency string
+
+const (
+	// Euro
+	EUR Currency = "EUR"
+
+	// Russian ruble
+	RUB Currency = "RUB"
+
+	// United States dollar
+	USD Currency = "USD"
+)

tariff_status.go

@@ -0,0 +1,12 @@
+package tdproto
+
+// Tariff status
+type TariffStatus string
+
+const (
+	// Tariff is active
+	ActiveTariff TariffStatus = "Active"
+
+	// Tariff in archive
+	ArchiveTariff TariffStatus = "Archive"
+)