Skip to content

Commit 9b97633

Browse files
fix ban flush (#277)
* fix ban flush by soft-deleting entries in database * fix unit tests accordingly
1 parent a8e6f9d commit 9b97633

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

pkg/database/delete.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ func (c *Context) DeleteBan(target string) (int, error) {
2525
}
2626

2727
func (c *Context) DeleteAll() error {
28+
allBa := types.BanApplication{}
29+
records := c.Db.Delete(&allBa)
30+
if records.Error != nil {
31+
return records.Error
32+
}
33+
return nil
34+
}
35+
36+
func (c *Context) HardDeleteAll() error {
2837
allBa := types.BanApplication{}
2938
records := c.Db.Unscoped().Delete(&allBa)
3039
if records.Error != nil {

pkg/database/delete_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestNoCleanUpParams(t *testing.T) {
2020
t.Fatalf("failed to create simple sqlite")
2121
}
2222

23-
if err := ctx.DeleteAll(); err != nil {
23+
if err := ctx.HardDeleteAll(); err != nil {
2424
t.Fatalf("failed to flush existing bans")
2525
}
2626

@@ -78,7 +78,7 @@ func TestNoCleanUp(t *testing.T) {
7878
t.Fatalf("failed to create simple sqlite")
7979
}
8080

81-
if err := ctx.DeleteAll(); err != nil {
81+
if err := ctx.HardDeleteAll(); err != nil {
8282
t.Fatalf("failed to flush existing bans")
8383
}
8484

@@ -143,7 +143,7 @@ func TestCleanUpByCount(t *testing.T) {
143143
t.Fatalf("failed to create simple sqlite")
144144
}
145145

146-
if err := ctx.DeleteAll(); err != nil {
146+
if err := ctx.HardDeleteAll(); err != nil {
147147
t.Fatalf("failed to flush existing bans")
148148
}
149149

@@ -255,7 +255,7 @@ func TestCleanUpByAge(t *testing.T) {
255255
t.Fatalf("failed to create simple sqlite")
256256
}
257257

258-
if err := ctx.DeleteAll(); err != nil {
258+
if err := ctx.HardDeleteAll(); err != nil {
259259
t.Fatalf("failed to flush existing bans")
260260
}
261261

pkg/database/read_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestFetchBans(t *testing.T) {
2727
t.Fatalf("failed to create simple sqlite")
2828
}
2929

30-
if err := ctx.DeleteAll(); err != nil {
30+
if err := ctx.HardDeleteAll(); err != nil {
3131
t.Fatalf("failed to flush existing bans")
3232
}
3333

0 commit comments

Comments
 (0)