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:
Christoph Haas 2026-03-26 23:34:05 +01:00
parent 93922e4cad
commit d5880d5096
8 changed files with 87 additions and 96 deletions

View file

@ -1,7 +1,7 @@
package db
func (d *DB) GetAllAliases() ([]AliasWithDomain, error) {
var aliases []Alias
var aliases []VirtualAlias
if err := d.Preload("Domain").Find(&aliases).Error; err != nil {
return nil, err
}
@ -9,8 +9,8 @@ func (d *DB) GetAllAliases() ([]AliasWithDomain, error) {
result := make([]AliasWithDomain, len(aliases))
for i, a := range aliases {
result[i] = AliasWithDomain{
Alias: a,
DomainName: "",
VirtualAlias: a,
DomainName: "",
}
if a.Domain != nil {
result[i].DomainName = a.Domain.Name
@ -23,35 +23,35 @@ func (d *DB) GetAllAliases() ([]AliasWithDomain, error) {
return result, nil
}
func (d *DB) GetAliasesByDomain(domainID uint) ([]Alias, error) {
var aliases []Alias
func (d *DB) GetAliasesByDomain(domainID uint) ([]VirtualAlias, error) {
var aliases []VirtualAlias
if err := d.Where("domain_id = ?", domainID).Find(&aliases).Error; err != nil {
return nil, err
}
if aliases == nil {
aliases = []Alias{}
aliases = []VirtualAlias{}
}
return aliases, nil
}
func (d *DB) GetAliasByID(id uint) (*Alias, error) {
var alias Alias
func (d *DB) GetAliasByID(id uint) (*VirtualAlias, error) {
var alias VirtualAlias
if err := d.Preload("Domain").First(&alias, id).Error; err != nil {
return nil, err
}
return &alias, nil
}
func (d *DB) GetAliasBySource(source string) (*Alias, error) {
var alias Alias
func (d *DB) GetAliasBySource(source string) (*VirtualAlias, error) {
var alias VirtualAlias
if err := d.Where("source = ?", source).First(&alias).Error; err != nil {
return nil, err
}
return &alias, nil
}
func (d *DB) CreateAlias(source, destination string) (*Alias, error) {
alias := Alias{
func (d *DB) CreateAlias(source, destination string) (*VirtualAlias, error) {
alias := VirtualAlias{
Source: source,
Destination: destination,
}
@ -61,8 +61,8 @@ func (d *DB) CreateAlias(source, destination string) (*Alias, error) {
return &alias, nil
}
func (d *DB) CreateAliasInDomain(source, destination string, domainID uint) (*Alias, error) {
alias := Alias{
func (d *DB) CreateAliasInDomain(source, destination string, domainID uint) (*VirtualAlias, error) {
alias := VirtualAlias{
DomainID: domainID,
Source: source,
Destination: destination,
@ -74,5 +74,5 @@ func (d *DB) CreateAliasInDomain(source, destination string, domainID uint) (*Al
}
func (d *DB) DeleteAlias(id uint) error {
return d.Delete(&Alias{}, id).Error
return d.Delete(&VirtualAlias{}, id).Error
}