Merge pull request #9 from benjaminbear/fix_cname_delete

fix model validation and preloading
benjaminbear · Jul 28, 2021 · 56c4693 · 56c4693
2 parents 79bd7fe + eb947bd
commit 56c4693
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,18 @@
-dist: bionic
-
 language: go
 
 env: GO111MODULE=on
 
 go:
-    - 1.15.x
-    - 1.16.x
+    - 1.13.x
+    - 1.14.x
 
 git:
     depth: 1
 
-script:
+before_script:
     - cd dyndns
+
+script:
     - go test -v ./...
     - go build ./...
 

diff --git a/dyndns/handler/cname.go b/dyndns/handler/cname.go
@@ -97,7 +97,7 @@ func (h *Handler) DeleteCName(c echo.Context) (err error) {
 	}
 
 	cname := &model.CName{}
-	if err = h.DB.First(cname, id).Error; err != nil {
+	if err = h.DB.Preload("Target").First(cname, id).Error; err != nil {
 		return c.JSON(http.StatusBadRequest, &Error{err.Error()})
 	}
 

diff --git a/dyndns/handler/host.go b/dyndns/handler/host.go
@@ -292,7 +292,6 @@ func (h *Handler) UpdateIP(c echo.Context) (err error) {
 }
 
 func (h *Handler) checkUniqueHostname(hostname, domain string) error {
-	fmt.Println(hostname, domain)
 	hosts := new([]model.Host)
 	if err := h.DB.Where(&model.Host{Hostname: hostname, Domain: domain}).Find(hosts).Error; err != nil {
 		return err

diff --git a/dyndns/model/host.go b/dyndns/model/host.go
@@ -10,7 +10,7 @@ import (
 type Host struct {
 	gorm.Model
 	Hostname   string    `gorm:"unique_index:idx_host_domain;not null" form:"hostname" validate:"required,hostname"`
-	Domain     string    `gorm:"unique_index:idx_host_domain;not null" validate:"required,hostname"`
+	Domain     string    `gorm:"unique_index:idx_host_domain;not null" form:"domain" validate:"required,hostname"`
 	Ip         string    `form:"ip" validate:"omitempty,ipv4"`
 	Ttl        int       `form:"ttl" validate:"required,min=20,max=86400"`
 	LastUpdate time.Time `form:"lastupdate"`