Fix setting site active to false

rupinr · Nov 1, 2024 · dad59bd · dad59bd
1 parent f82eaec
commit dad59bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -66,6 +66,7 @@ func main() {
 
 	r.POST("/admin/sites/update", auth.AuthMiddleware(auth.ValidateAdminToken), func(c *gin.Context) {
 		var sites []dto.Site
+
 		if c.ShouldBindJSON(&sites) == nil {
 			repository.UpdateSites(sites)
 		} else {
@@ -78,7 +79,7 @@ func main() {
 		siteData := []dto.Site{}
 
 		for _, site := range sites {
-			siteData = append(siteData, dto.Site{Url: site.Url, Name: site.Name, Active: site.Active, Language: site.Language})
+			siteData = append(siteData, dto.Site{Url: site.Url, Name: site.Name, Active: &site.Active, Language: site.Language})
 		}
 		jsonData, _ := json.Marshal(siteData)
 		c.Data(http.StatusOK, "application/json", jsonData)
@@ -117,7 +118,7 @@ func main() {
 		sites := repository.GetActiveSites()
 		siteData := []dto.Site{}
 		for _, site := range sites {
-			siteData = append(siteData, dto.Site{Url: site.Url, Name: site.Name, Active: site.Active})
+			siteData = append(siteData, dto.Site{Url: site.Url, Name: site.Name, Active: &site.Active})
 		}
 		jsonData, _ := json.Marshal(siteData)
 		c.Data(http.StatusOK, "application/json", jsonData)

diff --git a/datamodels/dto/dto.go b/datamodels/dto/dto.go
@@ -25,7 +25,7 @@ type TopicUpdate struct {
 type Site struct {
 	Url      string `json:"url" binding:"required"`
 	Name     string `json:"name" binding:"required"`
-	Active   bool   `json:"active"`
+	Active   *bool  `json:"active"`
 	Language string `json:"language"`
 }
 type Sites struct {

diff --git a/repository/repository.go b/repository/repository.go
@@ -31,7 +31,7 @@ func CreateSite(siteData dto.Site) {
 	db().Where(entity.Site{Url: siteData.Url}).Assign(entity.Site{
 		Name:     siteData.Name,
 		Language: siteData.Language,
-		Active:   siteData.Active,
+		Active:   *siteData.Active,
 	}).FirstOrCreate(&siteDb)
 }
 
@@ -43,12 +43,11 @@ func UpdateSites(siteData []dto.Site) {
 		}
 	}
 	for _, v := range siteData {
-		db().Where(entity.Site{
-			Url: v.Url,
-		}).UpdateColumns(entity.Site{
-			Name:     v.Name,
-			Active:   v.Active,
-			Language: v.Language,
+
+		db().Model(&entity.Site{}).Where(&entity.Site{Url: v.Url}).UpdateColumns(map[string]interface{}{
+			"Name":     v.Name,
+			"Active":   *v.Active,
+			"Language": v.Language,
 		})
 	}
 }