From 3823795379e30d7663e46c7a0c23a469787b4996 Mon Sep 17 00:00:00 2001
From: "guilhem.carron" <gcarron@grandlyon.com>
Date: Tue, 7 Dec 2021 09:49:58 +0100
Subject: [PATCH] fix(partnersInfo): Remove message from partnersInfo
---
internal/models/models.go | 1 -
internal/models/partnersInfo.go | 2 --
internal/rootmux/rootmux_test.go | 4 ++--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/internal/models/models.go b/internal/models/models.go
index 9fffb4e..d2b690f 100644
--- a/internal/models/models.go
+++ b/internal/models/models.go
@@ -45,7 +45,6 @@ func NewDataHandler() *DataHandler {
// Create default partner status
db.Create(&PartnersInfo{
- Message: "",
GRDFFailure: false,
EnedisFailure: false,
EGLFailure: false,
diff --git a/internal/models/partnersInfo.go b/internal/models/partnersInfo.go
index 0996fb1..35652e7 100644
--- a/internal/models/partnersInfo.go
+++ b/internal/models/partnersInfo.go
@@ -11,7 +11,6 @@ import (
type PartnersInfo struct {
ID uint `gorm:"<-:create"`
- Message string `json:"message"`
GRDFFailure bool `json:"grdf_failure"`
EnedisFailure bool `json:"enedis_failure"`
EGLFailure bool `json:"egl_failure"`
@@ -73,7 +72,6 @@ func (dh *DataHandler) SavePartnersInfo(w http.ResponseWriter, r *http.Request)
return
}
- updatedPartnersInfo.Message = partnersInfo.Message
updatedPartnersInfo.GRDFFailure = partnersInfo.GRDFFailure
updatedPartnersInfo.EnedisFailure = partnersInfo.EnedisFailure
updatedPartnersInfo.EGLFailure = partnersInfo.EGLFailure
diff --git a/internal/rootmux/rootmux_test.go b/internal/rootmux/rootmux_test.go
index 374f868..c52e2a1 100644
--- a/internal/rootmux/rootmux_test.go
+++ b/internal/rootmux/rootmux_test.go
@@ -24,7 +24,7 @@ var (
monthlyNewsStr string
newPoll = models.Poll{Year: 2021, Month: 0, Question: "pollQuestion", Link: "pollLink"}
newPollStr string
- partnersInfo = models.PartnersInfo{ID: 1, Message: "EGL est down", GRDFFailure: false, EnedisFailure: false, EGLFailure: true, NotificationActivated: true}
+ partnersInfo = models.PartnersInfo{ID: 1, GRDFFailure: false, EnedisFailure: false, EGLFailure: true, NotificationActivated: true}
partnersInfoStr string
noH map[string]string
)
@@ -103,7 +103,7 @@ func unloggedTests(t *testing.T) {
// Try to get a monthlyReport (must fail because not found)
do("GET", "/api/common/monthlyReport?year=2021&month=12", noH, "", http.StatusNotFound, "")
// Try to get partnersInfo (must pass)
- do("GET", "/api/common/partnersInfo", noH, "", http.StatusOK, `{"ID":1,"message":"","grdf_failure":false,"enedis_failure":false,"egl_failure":false,"notification_activated":false}`)
+ do("GET", "/api/common/partnersInfo", noH, "", http.StatusOK, `{"ID":1,"grdf_failure":false,"enedis_failure":false,"egl_failure":false,"notification_activated":false}`)
}
/**
--
GitLab