move types to app

app/account.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/accountingrule.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/accountingruleset.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/accountingrulesetitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/address.go

@@ -0,0 +1,12 @@
+package app
+
+// Address address struct
+type Address struct {
+	City        string
+	Country     string
+	CountryCode string
+	PostalCode  string
+	State       string
+	StateCode   string
+	Street      string
+}

app/backend.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/cashreceipt.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/charge.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/cluster.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/company.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/contact.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/coordinate.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/country.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/county.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/database.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/domain.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // Domain is a first class object type
 type Domain struct {

app/eft.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/eftitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/emailmessage.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/emaitemplate.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/filing.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/filingscheduleitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/filingtype.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/filingtypeinstance.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/folder.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/glaccount.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/glbalance.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/ingest.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/invoice.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/invoiceitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/job.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/journalentry.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/journalitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/lead.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/license.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/licensetype.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/log.go

@@ -1,9 +1,9 @@
-package types
+package app
 
 import "database/sql"
 
-// AppLog is a first class object type
+// Log is a first class object type
-type AppLog struct {
+type Log struct {
 	ID              string
 	AccountID       string
 	CompanyID       string

app/notebook.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/notebookitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/order.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/orderitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/outgoingemail.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // OutgoingEmailMessage is a first class object type
 type OutgoingEmailMessage struct {

app/outgoingemailreceipt.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // OutgoingEmailMessageReceipt is a first class object type
 type OutgoingEmailMessageReceipt struct {

app/paymentmethod.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/pdf.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/period.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/place.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/po.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/poitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/product.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/quote.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/quoteitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/ratingengine.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "github.com/go-sql-driver/mysql"
 

app/ratingengineitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "github.com/go-sql-driver/mysql"
 

app/role.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/service.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/state.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/submission.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/task.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/taskrelation.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/taskwhorelation.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/taxinstance.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/taxnexuscode.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // TaxnexusCode is a first class object type
 type TaxnexusCode struct {

app/taxrate.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // TaxRate is a principal object type
 type TaxRate struct {

app/taxtransaction.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import (
 	"database/sql"

app/taxtype.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/taxtypeaccount.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/template.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/tenant.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/tenantuser.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // TenantUser is a first class object type
 type TenantUser struct {

app/total.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // Total is a DB object
 type Total struct {

app/totalitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // TotalItem is a DB struct
 type TotalItem struct {

app/totaltaxitem.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // TotalTaxItem is a DB struct
 type TotalTaxItem struct {

app/transaction.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 import "database/sql"
 

app/user.go

@@ -4,7 +4,7 @@ import (
 	"github.com/go-openapi/runtime"
 )
 
-// User is a fist-class object in the app package
+// User is a first class object type
 type User struct {
 	ID                      string
 	AboutMe                 string
@@ -67,51 +67,3 @@ type User struct {
 	UserRoleID              string
 	UserType                string
 }
-
-// UserRole is a fist-class object in the app package
-type UserRole struct {
-	AccountID       string
-	Auth0RoleID     string
-	Auth0UserID     string
-	CompanyName     string
-	ContactID       string
-	RoleDescription string
-	RoleID          string
-	RoleName        string
-	TaxnexusAccount string
-	UserEmail       string
-	UserFullName    string
-	UserID          string
-	Username        string
-}
-
-// TenantUser is a fist-class object in the app package
-type TenantUser struct {
-	AccessLevel     string
-	AccountID       string
-	Auth0UserID     string
-	CompanyName     string
-	ContactID       string
-	TaxnexusAccount string
-	TenantActive    bool
-	TenantID        string
-	TenantName      string
-	TenantStatus    string
-	TenantType      string
-	TenantVersion   string
-	UserEmail       string
-	UserFullName    string
-	UserID          string
-	Username        string
-}
-
-// Address is a fist-class object in the app package
-type Address struct {
-	City        string
-	Country     string
-	CountryCode string
-	PostalCode  string
-	State       string
-	StateCode   string
-	Street      string
-}

app/userrole.go

@@ -1,4 +1,4 @@
-package types
+package app
 
 // UserRole is a first class object type
 type UserRole struct {

types/address.go

@@ -1,45 +0,0 @@
-package types
-
-import (
-	"code.tnxs.net/taxnexus/lib/api/crm/crm_models"
-)
-
-// Address address struct
-type Address struct {
-	City        string
-	Country     string
-	CountryCode string
-	PostalCode  string
-	State       string
-	StateCode   string
-	Street      string
-}
-
-func (obj *Address) marshalToCrmSwagger() *crm_models.Address {
-	if obj != nil {
-		return &crm_models.Address{
-			City:        obj.City,
-			Country:     obj.Country,
-			CountryCode: obj.CountryCode,
-			PostalCode:  obj.PostalCode,
-			State:       obj.State,
-			StateCode:   obj.StateCode,
-			Street:      obj.Street,
-		}
-	}
-	return nil
-}
-func unMarshalCrmAddress(swag *crm_models.Address) Address {
-	if swag != nil {
-		return Address{
-			City:        swag.City,
-			Country:     swag.Country,
-			CountryCode: swag.CountryCode,
-			PostalCode:  swag.PostalCode,
-			State:       swag.State,
-			StateCode:   swag.StateCode,
-			Street:      swag.Street,
-		}
-	}
-	return Address{}
-}

types/root.go

@@ -1,2 +0,0 @@
-// Package types contains all the Taxnexus First Class Object Types
-package types

types/user.go

@@ -1,71 +0,0 @@
-package types
-
-import (
-	"database/sql"
-
-	"github.com/go-openapi/runtime"
-)
-
-// User is a first class object type
-type User struct {
-	ID                      string
-	AboutMe                 string
-	AccountID               string
-	Address                 *Address
-	Alias                   string
-	APIKey                  string
-	Auth                    runtime.ClientAuthInfoWriter
-	Auth0UserID             string
-	CommunityNickname       string
-	CompanyName             string
-	ContactID               string
-	CreatedByID             string
-	CreatedDate             sql.NullTime
-	DelegatedApproverID     string
-	Department              string
-	Division                string
-	Email                   string
-	EmployeeNumber          string
-	EndOfDay                string
-	Environment             string
-	Extension               string
-	FabricAPIKey            string
-	Fax                     string
-	FirstName               string
-	ForecastEnabled         bool
-	FullPhotoURL            string
-	IsActive                bool
-	IsPortalEnabled         bool
-	IsProfilePhotoActive    bool
-	IsSystemControlled      bool
-	LastIP                  string
-	LastLogin               sql.NullTime
-	LastModifiedByID        string
-	LastModifiedDate        sql.NullTime
-	LastName                string
-	LoginCount              int64
-	ManagerID               string
-	MobilePhone             string
-	Name                    string
-	OutOfOfficeMessage      string
-	Phone                   string
-	PortalRole              string
-	ProfileID               string
-	ReceivesAdminEmails     bool
-	ReceivesAdminInfoEmails bool
-	ReceivesInfoEmails      bool
-	SenderEmail             string
-	SenderName              string
-	Signature               string
-	SmallPhotoURL           string
-	StartOfDay              string
-	TaxnexusAccount         string
-	TenantID                string
-	TenantUsers             []*TenantUser
-	TimeZone                string
-	Title                   string
-	Username                string
-	UserRoles               []*UserRole
-	UserRoleID              string
-	UserType                string
-}