diff --git a/internal/models/area.go b/internal/models/area.go
index 31f0af9e49cf231fb734b19ca2345623d77ad6c4..cd66e003060caaadbdb4bfd74f5e85b4dec72d04 100644
--- a/internal/models/area.go
+++ b/internal/models/area.go
@@ -110,10 +110,15 @@ func (d *DataHandler) putArea(w http.ResponseWriter, r *http.Request, id int) {
func (d *DataHandler) deleteArea(w http.ResponseWriter, r *http.Request, id int) {
if id != 0 {
var o Area
- if err := d.db.First(&o, id).Error; err != nil {
+ if err := d.db.Preload("Sections").First(&o, id).Error; err != nil {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
return
}
+
+ for _, section := range o.Sections {
+ d.deleteSection(w, r, int(section.ID))
+ }
+
d.db.Delete(&o)
} else {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
diff --git a/internal/models/election.go b/internal/models/election.go
index f53f6e73935cbe0be438b53c318e325b4f402efb..970cfd4330c6d942d71bc9049401ce18f2d66f7c 100644
--- a/internal/models/election.go
+++ b/internal/models/election.go
@@ -15,14 +15,14 @@ func (d *DataHandler) handleElection(w http.ResponseWriter, r *http.Request) {
case "GET":
switch auth.GetLoggedUserTechnical(w, r).Role {
case "ADMIN", "CAPTURER", "VISUALIZER":
- d.getElectionAdmin(w, r, id)
+ d.getElection(w, r, id)
default:
http.Error(w, ErrorRoleOfLoggedUser, http.StatusInternalServerError)
}
case "POST":
switch auth.GetLoggedUserTechnical(w, r).Role {
case "ADMIN":
- d.postElectionAdmin(w, r)
+ d.postElection(w, r)
case "CAPTURER", "VISUALIZER":
http.Error(w, ErrorNotAuthorizeMethodOnRessource, http.StatusMethodNotAllowed)
default:
@@ -32,7 +32,7 @@ func (d *DataHandler) handleElection(w http.ResponseWriter, r *http.Request) {
case "PUT":
switch auth.GetLoggedUserTechnical(w, r).Role {
case "ADMIN":
- d.putElectionAdmin(w, r, id)
+ d.putElection(w, r, id)
case "CAPTURER", "VISUALIZER":
http.Error(w, ErrorNotAuthorizeMethodOnRessource, http.StatusMethodNotAllowed)
default:
@@ -41,7 +41,7 @@ func (d *DataHandler) handleElection(w http.ResponseWriter, r *http.Request) {
case "DELETE":
switch auth.GetLoggedUserTechnical(w, r).Role {
case "ADMIN":
- d.deleteElectionAdmin(w, r, id)
+ d.deleteElection(w, r, id)
case "CAPTURER", "VISUALIZER":
http.Error(w, ErrorNotAuthorizeMethodOnRessource, http.StatusMethodNotAllowed)
default:
@@ -52,7 +52,7 @@ func (d *DataHandler) handleElection(w http.ResponseWriter, r *http.Request) {
}
}
-func (d *DataHandler) getElectionAdmin(w http.ResponseWriter, r *http.Request, id int) {
+func (d *DataHandler) getElection(w http.ResponseWriter, r *http.Request, id int) {
if id != 0 {
var o Election
if err := d.db.Preload("Areas").First(&o, id).Error; err != nil {
@@ -67,7 +67,7 @@ func (d *DataHandler) getElectionAdmin(w http.ResponseWriter, r *http.Request, i
}
}
-func (d *DataHandler) postElectionAdmin(w http.ResponseWriter, r *http.Request) {
+func (d *DataHandler) postElection(w http.ResponseWriter, r *http.Request) {
var o Election
err := json.NewDecoder(r.Body).Decode(&o)
if err != nil {
@@ -80,7 +80,7 @@ func (d *DataHandler) postElectionAdmin(w http.ResponseWriter, r *http.Request)
}
-func (d *DataHandler) putElectionAdmin(w http.ResponseWriter, r *http.Request, id int) {
+func (d *DataHandler) putElection(w http.ResponseWriter, r *http.Request, id int) {
var o Election
if err := d.db.Preload("Areas").First(&o, id).Error; err != nil {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
@@ -99,13 +99,18 @@ func (d *DataHandler) putElectionAdmin(w http.ResponseWriter, r *http.Request, i
}
-func (d *DataHandler) deleteElectionAdmin(w http.ResponseWriter, r *http.Request, id int) {
+func (d *DataHandler) deleteElection(w http.ResponseWriter, r *http.Request, id int) {
if id != 0 {
var o Election
- if err := d.db.First(&o, id).Error; err != nil {
+ if err := d.db.Preload("Areas").First(&o, id).Error; err != nil {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
return
}
+
+ for _, area := range o.Areas {
+ d.deleteArea(w, r, int(area.ID))
+ }
+
d.db.Delete(&o)
} else {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
diff --git a/internal/models/models.go b/internal/models/models.go
index 40fc52ba7df3ef9e4c7742d7f6a4d9b7bbb96d3a..38eb6d2315618ae594525a3bd73c03f629a2138a 100644
--- a/internal/models/models.go
+++ b/internal/models/models.go
@@ -35,7 +35,7 @@ const ErrorNotAuthorizeMethodOnRessource = "You're not authorize to execute this
// ErrorParentNotFound = "Could not get the parent associated to the object" with 500 http.StatusInternalServerError
const ErrorParentNotFound = "Could not get the parent associated to the object"
-// Election
+// Election represent an election divided in areas with 1 or several rounds
type Election struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -47,7 +47,7 @@ type Election struct {
Rounds []Round
}
-// Area
+// Area represent an area of an election divided in one or several Sections
type Area struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -60,7 +60,7 @@ type Area struct {
Sections []Section
}
-// Section
+// Section represent a section of an area divided in 1 or several Desks
type Section struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -72,7 +72,7 @@ type Section struct {
Desks []Desk
}
-// Desk
+// Desk represent a Desk office to vote from a section with the number of subscribed. It can be set to be a witness desk
type Desk struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -84,7 +84,7 @@ type Desk struct {
Subscribed uint
}
-// Party
+// Party represent a political party or tendance
type Party struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -95,7 +95,7 @@ type Party struct {
CandidateList []CandidateList
}
-// Capturer
+// Capturer is a user who can capture the results on the desks he is affected
type Capturer struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -106,7 +106,7 @@ type Capturer struct {
DeskRounds []DeskRound `gorm:"many2many:capturer_deskrounds;"`
}
-// Parameter
+// Parameter save the parameter for a round
type Parameter struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -117,7 +117,7 @@ type Parameter struct {
ShowMap bool
}
-// Round
+// Round represent a round for an election
type Round struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -132,7 +132,7 @@ type Round struct {
CandidateLists []CandidateList
}
-// DeskRound
+// DeskRound is a duplicate instance of a Desk to save the result for a round
type DeskRound struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -146,7 +146,7 @@ type DeskRound struct {
Votes []Vote
}
-// CandidateList
+// CandidateList is a list presented in an Area on an election
type CandidateList struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -160,7 +160,7 @@ type CandidateList struct {
Votes []Vote
}
-// Candidate
+// Candidate is a candiate presented on a list
type Candidate struct {
ID uint `gorm:"primary_key"`
CreatedAt time.Time `json:"-"`
@@ -176,7 +176,7 @@ type Candidate struct {
Removed bool
}
-// Vote
+// Vote represent the number of voice between a CanidateList and a Desk (+blank and null)
type Vote struct {
DeskRoundID uint `gorm:"primary_key"`
CandidateListID uint `gorm:"primary_key"`
diff --git a/internal/models/section.go b/internal/models/section.go
index dd81f8df94f8ad0fa5aedd98486998c611fc8b5e..3e9ec600601d14db42125fd5b1d5896c1559a332 100644
--- a/internal/models/section.go
+++ b/internal/models/section.go
@@ -109,10 +109,15 @@ func (d *DataHandler) putSection(w http.ResponseWriter, r *http.Request, id int)
func (d *DataHandler) deleteSection(w http.ResponseWriter, r *http.Request, id int) {
if id != 0 {
var o Section
- if err := d.db.First(&o, id).Error; err != nil {
+ if err := d.db.Preload("Desks").First(&o, id).Error; err != nil {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
return
}
+
+ for _, desk := range o.Desks {
+ d.deleteDesk(w, r, int(desk.ID))
+ }
+
d.db.Delete(&o)
} else {
http.Error(w, ErrorIDIsMissing, http.StatusNotFound)
diff --git a/internal/rootmux/rootmux_test.go b/internal/rootmux/rootmux_test.go
index c98e56807570f073af224f38e7f393fbc4a11eee..9ec0ac68dbd79e121e6fc838b2f342d68ddf0422 100644
--- a/internal/rootmux/rootmux_test.go
+++ b/internal/rootmux/rootmux_test.go
@@ -87,7 +87,20 @@ func appTests(t *testing.T) {
json.Unmarshal([]byte(response), &token)
xsrfHeader := tester.Header{Key: "XSRF-TOKEN", Value: token.XSRFToken}
+ // Add a capturer to an already bind UserID should fail
do("POST", "/api/Capturer", xsrfHeader, `{"UserID":2,"Name":"Capturer"}`, 500, `UserID is already bind to a Capturer`)
+
+ // Test deletion in cascade for generic election
+ do("POST", "/api/Election", xsrfHeader, `{"Name":"Grand Lyon 2020","BallotType":"metropolitan-direct"}`, 200, `{"ID":1,"Name":"Grand Lyon 2020","BallotType":"metropolitan-direct","Areas":null,"Rounds":null}`)
+ do("POST", "/api/Area", xsrfHeader, `{"ElectionID":1,"Name":"Area 1","SeatNumber":9,"MapID":"1"}`, 200, `{"ID":1,"ElectionID":1,"Name":"Area 1","SeatNumber":9,"MapID":"1","Sections":null}`)
+ do("POST", "/api/Section", xsrfHeader, `{"AreaID":1,"Name":"Section 1","MapID":"1"}`, 200, `{"ID":1,"AreaID":1,"Name":"Section 1","MapID":"1","Desks":null}`)
+ do("POST", "/api/Desk", xsrfHeader, `{"SectionID":1,"Name":"Desk 1","WitnessDesk":true,"Subscribed":9587}`, 200, `{"ID":1,"SectionID":1,"Name":"Desk 1","WitnessDesk":true,"Subscribed":9587}`)
+
+ do("DELETE", "/api/Election/1", xsrfHeader, ``, 200, ``)
+ do("GET", "/api/Area/1", xsrfHeader, ``, 404, `id is missing`)
+ do("GET", "/api/Section/1", xsrfHeader, ``, 404, `id is missing`)
+ do("GET", "/api/Desk/1", xsrfHeader, ``, 404, `id is missing`)
+
}
// Do an OAuth2 login with an known admin
do("GET", "/OAuth2Login", noH, "", 200, "<!DOCTYPE html>")