New report router and user reporting refactoring (#25713)
* Added materialized view migration * Renamed mat view * Added channel membership mat view and indexes * Added channel membership mat view and indexes * Added new index * WIP * Simplifying user reporting code * Created app and API layer for cahnnel reporting, reporting refactoring in general * New router * Remobved channel reporting meanwhile * Upodated autogenerated stuff * Lint fix * Fixed typo * api vet * i18n fix * Fixed API vetting and removed channel reporting constants * yaml * removed app pagination tests
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
32880efa25
Коммит
97a23d791e
@@ -108,8 +108,6 @@ func (api *API) InitUser() {
|
||||
|
||||
api.BaseRoutes.Users.Handle("/notify-admin", api.APISessionRequired(handleNotifyAdmin)).Methods("POST")
|
||||
api.BaseRoutes.Users.Handle("/trigger-notify-admin-posts", api.APISessionRequired(handleTriggerNotifyAdminPosts)).Methods("POST")
|
||||
|
||||
api.BaseRoutes.Users.Handle("/report", api.APISessionRequired(getUsersForReporting)).Methods("GET")
|
||||
}
|
||||
|
||||
func createUser(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
@@ -3445,59 +3443,3 @@ func getUsersWithInvalidEmails(c *Context, w http.ResponseWriter, r *http.Reques
|
||||
c.Logger.Warn("Error writing response", mlog.Err(err))
|
||||
}
|
||||
}
|
||||
|
||||
func getUsersForReporting(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
if !(c.IsSystemAdmin() && c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionSysconsoleReadUserManagementUsers)) {
|
||||
c.SetPermissionError(model.PermissionSysconsoleReadUserManagementUsers)
|
||||
return
|
||||
}
|
||||
|
||||
sortColumn := "Username"
|
||||
if r.URL.Query().Get("sort_column") != "" {
|
||||
sortColumn = r.URL.Query().Get("sort_column")
|
||||
}
|
||||
|
||||
pageSize := 50
|
||||
if pageSizeStr, err := strconv.ParseInt(r.URL.Query().Get("page_size"), 10, 64); err == nil {
|
||||
pageSize = int(pageSizeStr)
|
||||
}
|
||||
|
||||
teamFilter := r.URL.Query().Get("team_filter")
|
||||
if !(teamFilter == "" || model.IsValidId(teamFilter)) {
|
||||
c.Err = model.NewAppError("getUsersForReporting", "api.getUsersForReporting.invalid_team_filter", nil, "", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
hideActive := r.URL.Query().Get("hide_active") == "true"
|
||||
hideInactive := r.URL.Query().Get("hide_inactive") == "true"
|
||||
if hideActive && hideInactive {
|
||||
c.Err = model.NewAppError("getUsersForReporting", "api.getUsersForReporting.invalid_active_filter", nil, "", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
options := &model.UserReportOptionsAPI{
|
||||
UserReportOptionsWithoutDateRange: model.UserReportOptionsWithoutDateRange{
|
||||
SortColumn: sortColumn,
|
||||
SortDesc: r.URL.Query().Get("sort_direction") == "desc",
|
||||
PageSize: pageSize,
|
||||
Team: teamFilter,
|
||||
LastSortColumnValue: r.URL.Query().Get("last_column_value"),
|
||||
LastUserId: r.URL.Query().Get("last_id"),
|
||||
Role: r.URL.Query().Get("role_filter"),
|
||||
HasNoTeam: r.URL.Query().Get("has_no_team") == "true",
|
||||
HideActive: hideActive,
|
||||
HideInactive: hideInactive,
|
||||
},
|
||||
DateRange: r.URL.Query().Get("date_range"),
|
||||
}
|
||||
|
||||
userReports, err := c.App.GetUsersForReporting(options.ToBaseOptions(time.Now()))
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
}
|
||||
|
||||
if jsonErr := json.NewEncoder(w).Encode(userReports); jsonErr != nil {
|
||||
c.Logger.Warn("Error writing response", mlog.Err(jsonErr))
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user