mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
Revert "[FIX/BE-US]add feature restrict by location and areas in roles"
This reverts commit dff9e73ab1.
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
|
||||
"gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/dto"
|
||||
service "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/services"
|
||||
validation "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/validations"
|
||||
@@ -82,20 +81,6 @@ func (u *DashboardController) GetAll(c *fiber.Ctx) error {
|
||||
return fiber.NewError(fiber.StatusBadRequest, "Invalid include")
|
||||
}
|
||||
|
||||
scope, err := m.ResolveLocationScope(c, u.DashboardService.DB())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if scope.Restrict {
|
||||
if len(scope.IDs) == 0 {
|
||||
lokasiIds = []uint{}
|
||||
} else if len(lokasiIds) > 0 {
|
||||
lokasiIds = intersectUint(lokasiIds, scope.IDs)
|
||||
} else {
|
||||
lokasiIds = scope.IDs
|
||||
}
|
||||
}
|
||||
|
||||
analysisMode := strings.ToUpper(strings.TrimSpace(c.Query("analysis_mode", validation.AnalysisModeOverview)))
|
||||
metric := strings.ToLower(strings.TrimSpace(c.Query("metric", "")))
|
||||
|
||||
@@ -191,23 +176,6 @@ func defaultUintSlice(values []uint) []uint {
|
||||
return values
|
||||
}
|
||||
|
||||
func intersectUint(a, b []uint) []uint {
|
||||
if len(a) == 0 || len(b) == 0 {
|
||||
return nil
|
||||
}
|
||||
set := make(map[uint]struct{}, len(b))
|
||||
for _, id := range b {
|
||||
set[id] = struct{}{}
|
||||
}
|
||||
out := make([]uint, 0, len(a))
|
||||
for _, id := range a {
|
||||
if _, ok := set[id]; ok {
|
||||
out = append(out, id)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func parsePeriodDates(startDateRaw, endDateRaw string, location *time.Location) (time.Time, time.Time, time.Time, error) {
|
||||
now := time.Now().In(location)
|
||||
startDate := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, location)
|
||||
|
||||
Reference in New Issue
Block a user