mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Serialise the World as well

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-02 17:51:54 +01:00
parent 50c970fea2
commit 68d117e0d8
5 changed files with 76 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pkg/accounts/accounts.go
View file

@ -26,12 +26,11 @@ type Account struct {
// Represents the accountant data to store
type accountantData struct {
Accounts map[uuid.UUID]Account `json:"accounts"`
}
// Accountant manages a set of accounts
type Accountant struct {
data accountantData
Accounts map[uuid.UUID]Account `json:"accounts"`
dataPath string
}
@ -39,9 +38,7 @@ type Accountant struct {
func NewAccountant(dataPath string) *Accountant {
return &Accountant{
dataPath: dataPath,
data: accountantData{
Accounts: make(map[uuid.UUID]Account),
},
Accounts: make(map[uuid.UUID]Account),
}
}
@ -52,7 +49,7 @@ func (a *Accountant) RegisterAccount(acc Account) (Account, error) {
acc.Id = uuid.New()
// Verify this acount isn't already registered
for _, a := range a.data.Accounts {
for _, a := range a.Accounts {
if a.Name == acc.Name {
return Account{}, fmt.Errorf("Account name already registered")
} else if a.Id == acc.Id {
@ -61,7 +58,7 @@ func (a *Accountant) RegisterAccount(acc Account) (Account, error) {
}
// Simply add the account to the map
a.data.Accounts[acc.Id] = acc
a.Accounts[acc.Id] = acc
return acc, nil
}
@ -82,7 +79,7 @@ func (a *Accountant) Load() error {
if b, err := ioutil.ReadFile(a.path()); err != nil {
return err
} else if err := json.Unmarshal(b, &a.data); err != nil {
} else if err := json.Unmarshal(b, &a); err != nil {
return err
}
return nil
@ -90,7 +87,7 @@ func (a *Accountant) Load() error {
// Save will save the accountant data out
func (a *Accountant) Save() error {
if b, err := json.MarshalIndent(a.data, "", "\t"); err != nil {
if b, err := json.MarshalIndent(a, "", "\t"); err != nil {
return err
} else {
if err := ioutil.WriteFile(a.path(), b, os.ModePerm); err != nil {
@ -104,9 +101,9 @@ func (a *Accountant) Save() error {
func (a *Accountant) AssignPrimary(account uuid.UUID, instance uuid.UUID) error {
// Find the account matching the ID
if this, ok := a.data.Accounts[account]; ok {
if this, ok := a.Accounts[account]; ok {
this.Primary = instance
a.data.Accounts[account] = this
a.Accounts[account] = this
} else {
return fmt.Errorf("no account found for id: %s", account)
}

16
pkg/accounts/accounts_test.go
View file

@ -53,7 +53,7 @@ func TestAccountant_RegisterAccount(t *testing.T) {
func TestAccountant_LoadSave(t *testing.T) {
accountant := NewAccountant(os.TempDir())
if len(accountant.data.Accounts) != 0 {
if len(accountant.Accounts) != 0 {
t.Error("New accountant created with non-zero account number")
}
@ -64,9 +64,9 @@ func TestAccountant_LoadSave(t *testing.T) {
t.Error(err)
}
if len(accountant.data.Accounts) != 1 {
if len(accountant.Accounts) != 1 {
t.Error("No new account made")
} else if accountant.data.Accounts[a.Id].Name != name {
} else if accountant.Accounts[a.Id].Name != name {
t.Error("New account created with wrong name")
}
@ -77,7 +77,7 @@ func TestAccountant_LoadSave(t *testing.T) {
// Re-create the accountant
accountant = NewAccountant(os.TempDir())
if len(accountant.data.Accounts) != 0 {
if len(accountant.Accounts) != 0 {
t.Error("New accountant created with non-zero account number")
}
@ -87,16 +87,16 @@ func TestAccountant_LoadSave(t *testing.T) {
}
// Verify we have the same account again
if len(accountant.data.Accounts) != 1 {
if len(accountant.Accounts) != 1 {
t.Error("No account after load")
} else if accountant.data.Accounts[a.Id].Name != name {
} else if accountant.Accounts[a.Id].Name != name {
t.Error("New account created with wrong name")
}
}
func TestAccountant_AssignPrimary(t *testing.T) {
accountant := NewAccountant(os.TempDir())
if len(accountant.data.Accounts) != 0 {
if len(accountant.Accounts) != 0 {
t.Error("New accountant created with non-zero account number")
}
@ -112,7 +112,7 @@ func TestAccountant_AssignPrimary(t *testing.T) {
err = accountant.AssignPrimary(a.Id, inst)
if err != nil {
t.Error("Failed to set primary for created account")
} else if accountant.data.Accounts[a.Id].Primary != inst {
} else if accountant.Accounts[a.Id].Primary != inst {
t.Error("Primary for assigned account is incorrect")
}
}