diff --git a/i18n/de.json b/i18n/de.json index 9d97065f9b..b13c709ff9 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Die Grenze für Paging wurde überschritten" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Es ist ein Fehler beim permanenten Löschen des Stapels von Audits aufgetreten" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Es trat ein Fehler beim Löschen der Audits auf" diff --git a/i18n/en.json b/i18n/en.json index 4ef9706bfd..0a7045f51f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5634,10 +5634,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Limit exceeded for paging" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "We encountered an error permanently deleting the batch of audits" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "We encountered an error deleting the audits" diff --git a/i18n/es.json b/i18n/es.json index 81fccfe0b0..6c8328c0bc 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Límite de paginación excedido" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Hemos detectado un error al eliminar permanentemente el lote de auditorías" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Encontramos un error al eliminar los audits" diff --git a/i18n/fr.json b/i18n/fr.json index 44c6b20707..9f44b0f9c3 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Limite dépassée pour la pagination" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Une erreur s'est produite lors de la suppression définitive du lot d'audits" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Une erreur s'est produite lors de la suppression des audits" diff --git a/i18n/it.json b/i18n/it.json index fba3ccaf19..9342146b7a 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Limite di paginazione superato" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Si è verificato un errore durante la cancellazione degli audit" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Riscontrato un errore durante la cancellazione degli audit" diff --git a/i18n/ja.json b/i18n/ja.json index 80de9a5133..7533d7a84b 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "これ以上のページを生成できません" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "監査バッチを完全に削除する際にエラーが発生しました" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "監査データを削除する際にエラーが発生しました" diff --git a/i18n/ko.json b/i18n/ko.json index c52bb4dbcd..d3bb4f6040 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Limit exceeded for paging" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "We encountered an error permanently deleting the batch of audits" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "We encountered an error deleting the audits" diff --git a/i18n/nl.json b/i18n/nl.json index 92886986a7..426a730387 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Grens bereikt voor opdelen in pagina's" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "We encountered an error permanently deleting the batch of audits" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Fout opgestreden bij het verwijderen van de audit data" diff --git a/i18n/pl.json b/i18n/pl.json index b1520e1f0c..d44b8a0115 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Przekroczono limit stronicowania" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Napotkaliśmy błąd powodujący trwałe usunięcie partii audytów" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Napotkaliśmy błąd usuwając audyty" diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json index cf6aa5c695..892386f05b 100644 --- a/i18n/pt-BR.json +++ b/i18n/pt-BR.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Limite excedido para paginação" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Encontramos um erro ao apagar o lote de audits" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Encontramos um erro ao deletar o audits" diff --git a/i18n/ro.json b/i18n/ro.json index 0c923af58e..4e16041732 100644 --- a/i18n/ro.json +++ b/i18n/ro.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Limita depășită pentru paginare" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Am întâmpinat o eroare de ștergere definitivă a lotului de audit" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Am întâmpinat o eroare la ștergerea auditurilor" diff --git a/i18n/ru.json b/i18n/ru.json index 22e4303529..35b74fb6fb 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Превышено ограничение количества страниц" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "We encountered an error permanently deleting the batch of audits" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Обнаружены проблемы с удалением аудитов" diff --git a/i18n/tr.json b/i18n/tr.json index 40615d161f..d94fc347d0 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Sayfalandırma sınırı aşıldı" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Toplu denetimler kalıcı olarak silinirken bir sorun çıktı" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Denetimler silinirken bir sorun çıktı" diff --git a/i18n/uk.json b/i18n/uk.json index 17ff5ea81d..7394f5251b 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "Перевищене обмеження кількості сторінок" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "Ми зіткнулися з помилкою, остаточно видаляючи пакет перевірок" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "Виникла помилка при спробі прочитати файл" diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index 2bbd5a6e20..7b12731e8a 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "已达到分页限制" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "批量永久删除审计时遇到错误" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "我们删除审计时遇到了一个错误" diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json index 08f5b4235e..cef3629dc9 100644 --- a/i18n/zh-TW.json +++ b/i18n/zh-TW.json @@ -5178,10 +5178,6 @@ "id": "store.sql_audit.get.limit.app_error", "translation": "分頁已達限制" }, - { - "id": "store.sql_audit.permanent_delete_batch.app_error", - "translation": "永久批次刪除稽核時遇到錯誤" - }, { "id": "store.sql_audit.permanent_delete_by_user.app_error", "translation": "刪除稽核紀錄時遇到錯誤" diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go index 95f986f503..db248d4605 100644 --- a/store/sqlstore/audit_store.go +++ b/store/sqlstore/audit_store.go @@ -71,23 +71,3 @@ func (s SqlAuditStore) PermanentDeleteByUser(userId string) *model.AppError { } return nil } - -func (s SqlAuditStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { - var query string - if s.DriverName() == "postgres" { - query = "DELETE from Audits WHERE Id = any (array (SELECT Id FROM Audits WHERE CreateAt < :EndTime LIMIT :Limit))" - } else { - query = "DELETE from Audits WHERE CreateAt < :EndTime LIMIT :Limit" - } - - sqlResult, err := s.GetMaster().Exec(query, map[string]interface{}{"EndTime": endTime, "Limit": limit}) - if err != nil { - return 0, model.NewAppError("SqlAuditStore.PermanentDeleteBatch", "store.sql_audit.permanent_delete_batch.app_error", nil, ""+err.Error(), http.StatusInternalServerError) - } - - rowsAffected, err := sqlResult.RowsAffected() - if err != nil { - return 0, model.NewAppError("SqlAuditStore.PermanentDeleteBatch", "store.sql_audit.permanent_delete_batch.app_error", nil, ""+err.Error(), http.StatusInternalServerError) - } - return rowsAffected, nil -} diff --git a/store/store.go b/store/store.go index f7bca759aa..3c8b452c57 100644 --- a/store/store.go +++ b/store/store.go @@ -328,7 +328,6 @@ type AuditStore interface { Save(audit *model.Audit) *model.AppError Get(user_id string, offset int, limit int) (model.Audits, *model.AppError) PermanentDeleteByUser(userId string) *model.AppError - PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) } type ClusterDiscoveryStore interface { diff --git a/store/storetest/audit_store.go b/store/storetest/audit_store.go index b9bbbd726c..d25779eef0 100644 --- a/store/storetest/audit_store.go +++ b/store/storetest/audit_store.go @@ -15,7 +15,6 @@ import ( func TestAuditStore(t *testing.T, ss store.Store) { t.Run("", func(t *testing.T) { testAuditStore(t, ss) }) - t.Run("PermanentDeleteBatch", func(t *testing.T) { testAuditStorePermanentDeleteBatch(t, ss) }) } func testAuditStore(t *testing.T, ss store.Store) { @@ -49,29 +48,3 @@ func testAuditStore(t *testing.T, ss store.Store) { require.Nil(t, ss.Audit().PermanentDeleteByUser(audit.UserId)) } - -func testAuditStorePermanentDeleteBatch(t *testing.T, ss store.Store) { - a1 := &model.Audit{UserId: model.NewId(), IpAddress: "ipaddress", Action: "Action"} - require.Nil(t, ss.Audit().Save(a1)) - time.Sleep(10 * time.Millisecond) - a2 := &model.Audit{UserId: a1.UserId, IpAddress: "ipaddress", Action: "Action"} - require.Nil(t, ss.Audit().Save(a2)) - time.Sleep(10 * time.Millisecond) - cutoff := model.GetMillis() - time.Sleep(10 * time.Millisecond) - a3 := &model.Audit{UserId: a1.UserId, IpAddress: "ipaddress", Action: "Action"} - require.Nil(t, ss.Audit().Save(a3)) - - audits, err := ss.Audit().Get(a1.UserId, 0, 100) - require.Nil(t, err) - assert.Len(t, audits, 3) - - _, err = ss.Audit().PermanentDeleteBatch(cutoff, 1000000) - require.Nil(t, err) - - audits, err = ss.Audit().Get(a1.UserId, 0, 100) - require.Nil(t, err) - assert.Len(t, audits, 1) - - require.Nil(t, ss.Audit().PermanentDeleteByUser(a1.UserId)) -} diff --git a/store/storetest/mocks/AuditStore.go b/store/storetest/mocks/AuditStore.go index 83cac4899e..a00df042de 100644 --- a/store/storetest/mocks/AuditStore.go +++ b/store/storetest/mocks/AuditStore.go @@ -39,29 +39,6 @@ func (_m *AuditStore) Get(user_id string, offset int, limit int) (model.Audits, return r0, r1 } -// PermanentDeleteBatch provides a mock function with given fields: endTime, limit -func (_m *AuditStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { - ret := _m.Called(endTime, limit) - - var r0 int64 - if rf, ok := ret.Get(0).(func(int64, int64) int64); ok { - r0 = rf(endTime, limit) - } else { - r0 = ret.Get(0).(int64) - } - - var r1 *model.AppError - if rf, ok := ret.Get(1).(func(int64, int64) *model.AppError); ok { - r1 = rf(endTime, limit) - } else { - if ret.Get(1) != nil { - r1 = ret.Get(1).(*model.AppError) - } - } - - return r0, r1 -} - // PermanentDeleteByUser provides a mock function with given fields: userId func (_m *AuditStore) PermanentDeleteByUser(userId string) *model.AppError { ret := _m.Called(userId) diff --git a/store/timer_layer.go b/store/timer_layer.go index 599cbbedfd..ae007f911a 100644 --- a/store/timer_layer.go +++ b/store/timer_layer.go @@ -344,22 +344,6 @@ func (s *TimerLayerAuditStore) Get(user_id string, offset int, limit int) (model return resultVar0, resultVar1 } -func (s *TimerLayerAuditStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { - start := timemodule.Now() - - resultVar0, resultVar1 := s.AuditStore.PermanentDeleteBatch(endTime, limit) - - elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) - if s.Root.Metrics != nil { - success := "false" - if resultVar1 == nil { - success = "true" - } - s.Root.Metrics.ObserveStoreMethodDuration("AuditStore.PermanentDeleteBatch", success, elapsed) - } - return resultVar0, resultVar1 -} - func (s *TimerLayerAuditStore) PermanentDeleteByUser(userId string) *model.AppError { start := timemodule.Now()