Rename ISPmail models to use Virtual* prefix
- Domain -> VirtualDomain - User -> VirtualUser - Alias -> VirtualAlias This clarifies which tables are ISPmail tables vs IMC tables.
This commit is contained in:
parent
93922e4cad
commit
d5880d5096
8 changed files with 87 additions and 96 deletions
|
|
@ -1,7 +1,7 @@
|
|||
package db
|
||||
|
||||
func (d *DB) GetAllDomains() ([]DomainStats, error) {
|
||||
var domains []Domain
|
||||
var domains []VirtualDomain
|
||||
if err := d.Order("name ASC").Find(&domains).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -9,8 +9,8 @@ func (d *DB) GetAllDomains() ([]DomainStats, error) {
|
|||
stats := make([]DomainStats, len(domains))
|
||||
for i, dom := range domains {
|
||||
var userCount, aliasCount int64
|
||||
d.Model(&User{}).Where("domain_id = ?", dom.ID).Count(&userCount)
|
||||
d.Model(&Alias{}).Where("domain_id = ?", dom.ID).Count(&aliasCount)
|
||||
d.Model(&VirtualUser{}).Where("domain_id = ?", dom.ID).Count(&userCount)
|
||||
d.Model(&VirtualAlias{}).Where("domain_id = ?", dom.ID).Count(&aliasCount)
|
||||
|
||||
stats[i] = DomainStats{
|
||||
ID: dom.ID,
|
||||
|
|
@ -26,24 +26,24 @@ func (d *DB) GetAllDomains() ([]DomainStats, error) {
|
|||
return stats, nil
|
||||
}
|
||||
|
||||
func (d *DB) GetDomainByID(id uint) (*Domain, error) {
|
||||
var domain Domain
|
||||
func (d *DB) GetDomainByID(id uint) (*VirtualDomain, error) {
|
||||
var domain VirtualDomain
|
||||
if err := d.Where("id = ?", id).First(&domain).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &domain, nil
|
||||
}
|
||||
|
||||
func (d *DB) GetDomainByName(name string) (*Domain, error) {
|
||||
var domain Domain
|
||||
func (d *DB) GetDomainByName(name string) (*VirtualDomain, error) {
|
||||
var domain VirtualDomain
|
||||
if err := d.Where("name = ?", name).First(&domain).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &domain, nil
|
||||
}
|
||||
|
||||
func (d *DB) CreateDomain(name string) (*Domain, error) {
|
||||
domain := Domain{Name: name}
|
||||
func (d *DB) CreateDomain(name string) (*VirtualDomain, error) {
|
||||
domain := VirtualDomain{Name: name}
|
||||
if err := d.Create(&domain).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -54,13 +54,13 @@ func (d *DB) DeleteDomain(id uint) error {
|
|||
tx := d.Begin()
|
||||
defer func() { tx.Rollback() }()
|
||||
|
||||
if err := tx.Where("domain_id = ?", id).Delete(&User{}).Error; err != nil {
|
||||
if err := tx.Where("domain_id = ?", id).Delete(&VirtualUser{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Where("domain_id = ?", id).Delete(&Alias{}).Error; err != nil {
|
||||
if err := tx.Where("domain_id = ?", id).Delete(&VirtualAlias{}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Delete(&Domain{}, id).Error; err != nil {
|
||||
if err := tx.Delete(&VirtualDomain{}, id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue