Skip to content
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

Fix https://github.com/contiv/modelgen/issues/6 #7

Merged
merged 1 commit into from
Mar 16, 2016
Merged

Fix https://github.com/contiv/modelgen/issues/6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions generators/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,8 @@ func Create{{ initialCap .Name }}(obj *{{ initialCap .Name }}) error {
return errors.New("Invalid object type")
}

saveObj := obj

// Check if object already exists
if collections.{{ .Name }}s[obj.Key] != nil {
// Perform Update callback
Expand All @@ -619,6 +621,9 @@ func Create{{ initialCap .Name }}(obj *{{ initialCap .Name }}) error {
log.Errorf("{{ initialCap .Name }}Update retruned error for: %+v. Err: %v", obj, err)
return err
}

// save the original object after update
saveObj = collections.{{ .Name }}s[obj.Key]
} else {
// save it in cache
collections.{{ .Name }}s[obj.Key] = obj
Expand All @@ -633,9 +638,9 @@ func Create{{ initialCap .Name }}(obj *{{ initialCap .Name }}) error {
}

// Write it to modeldb
err = obj.Write()
err = saveObj.Write()
if err != nil {
log.Errorf("Error saving {{ .Name }} %s to db. Err: %v", obj.Key, err)
log.Errorf("Error saving {{ .Name }} %s to db. Err: %v", saveObj.Key, err)
return err
}

Expand Down
9 changes: 7 additions & 2 deletions generators/templates/routeFunc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ func Create{{ initialCap .Name }}(obj *{{ initialCap .Name }}) error {
return errors.New("Invalid object type")
}

saveObj := obj

// Check if object already exists
if collections.{{ .Name }}s[obj.Key] != nil {
// Perform Update callback
Expand All @@ -147,6 +149,9 @@ func Create{{ initialCap .Name }}(obj *{{ initialCap .Name }}) error {
log.Errorf("{{ initialCap .Name }}Update retruned error for: %+v. Err: %v", obj, err)
return err
}

// save the original object after update
saveObj = collections.{{ .Name }}s[obj.Key]
} else {
// save it in cache
collections.{{ .Name }}s[obj.Key] = obj
Expand All @@ -161,9 +166,9 @@ func Create{{ initialCap .Name }}(obj *{{ initialCap .Name }}) error {
}

// Write it to modeldb
err = obj.Write()
err = saveObj.Write()
if err != nil {
log.Errorf("Error saving {{ .Name }} %s to db. Err: %v", obj.Key, err)
log.Errorf("Error saving {{ .Name }} %s to db. Err: %v", saveObj.Key, err)
return err
}

Expand Down
18 changes: 14 additions & 4 deletions testdata/one/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ func CreateTenant(obj *Tenant) error {
return errors.New("Invalid object type")
}

saveObj := obj

// Check if object already exists
if collections.tenants[obj.Key] != nil {
// Perform Update callback
Expand All @@ -251,6 +253,9 @@ func CreateTenant(obj *Tenant) error {
log.Errorf("TenantUpdate retruned error for: %+v. Err: %v", obj, err)
return err
}

// save the original object after update
saveObj = collections.tenants[obj.Key]
} else {
// save it in cache
collections.tenants[obj.Key] = obj
Expand All @@ -265,9 +270,9 @@ func CreateTenant(obj *Tenant) error {
}

// Write it to modeldb
err = obj.Write()
err = saveObj.Write()
if err != nil {
log.Errorf("Error saving tenant %s to db. Err: %v", obj.Key, err)
log.Errorf("Error saving tenant %s to db. Err: %v", saveObj.Key, err)
return err
}

Expand Down Expand Up @@ -477,6 +482,8 @@ func CreateNetwork(obj *Network) error {
return errors.New("Invalid object type")
}

saveObj := obj

// Check if object already exists
if collections.networks[obj.Key] != nil {
// Perform Update callback
Expand All @@ -485,6 +492,9 @@ func CreateNetwork(obj *Network) error {
log.Errorf("NetworkUpdate retruned error for: %+v. Err: %v", obj, err)
return err
}

// save the original object after update
saveObj = collections.networks[obj.Key]
} else {
// save it in cache
collections.networks[obj.Key] = obj
Expand All @@ -499,9 +509,9 @@ func CreateNetwork(obj *Network) error {
}

// Write it to modeldb
err = obj.Write()
err = saveObj.Write()
if err != nil {
log.Errorf("Error saving network %s to db. Err: %v", obj.Key, err)
log.Errorf("Error saving network %s to db. Err: %v", saveObj.Key, err)
return err
}

Expand Down