tom/arbeitszeitmessung
3
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Releases 9 Wiki Activity

cleanup/small refactor + first tests

Browse Source
This commit is contained in:
Tom Tröger
2025-07-17 19:28:21 +02:00
parent 6688128d30
commit 68000a0f0a
6 changed files with 99 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Backend/endpoints/team.go
View File

@@ -25,18 +25,6 @@ func TeamHandler(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Method not allowed!", http.StatusMethodNotAllowed)
break
}
// user, err := (*models.User).GetUserFromSession(nil, Session, r.Context())
// if err != nil {
// log.Println("No user found with the given personal number!")
// http.Redirect(w, r, "/user/login", http.StatusSeeOther)
// return
// }
// var userWorkDays []models.WorkDay
// userWorkDays = (*models.WorkDay).GetWorkDays(nil, user.CardUID, time.Date(2025, time.February, 24, 0, 0, 0, 0, time.Local), time.Date(2025, time.February, 24+7, 0, 0, 0, 0, time.Local))
// log.Println("User:", user)
// teamMembers, err := user.GetTeamMembers()
// getWeeksTillNow(time.Now().AddDate(0, 0, -14))
// templates.TeamPage(teamMembers, userWorkDays).Render(r.Context(), w)
}
func submitReport(w http.ResponseWriter, r *http.Request) {
@@ -84,7 +72,7 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
if submissionDate != "" {
submissionDate, err := time.Parse("2006-01-02", submissionDate)
if err == nil {
lastSub = getMonday(submissionDate)
lastSub = helper.GetMonday(submissionDate)
}
}
userWeek := (*models.WorkWeek).GetWeek(nil, user, lastSub, true)
@@ -98,38 +86,3 @@ func showWeeks(w http.ResponseWriter, r *http.Request) {
// isRunningWeek := time.Since(lastSub) < 24*5*time.Hour //the last submission is this week and cannot be send yet
templates.TeamPage(workWeeks, userWeek).Render(r.Context(), w)
}
func getWeeksTillNow(lastWeek time.Time) []time.Time {
var weeks []time.Time
if lastWeek.After(time.Now()) {
log.Println("Timestamp is after today, no weeks till now!")
return weeks
}
if lastWeek.Weekday() != time.Monday {
if lastWeek.Weekday() == time.Sunday {
lastWeek = lastWeek.AddDate(0, 0, -6)
} else {
lastWeek = lastWeek.AddDate(0, 0, -int(lastWeek.Weekday()-1))
}
}
if time.Since(lastWeek) < 24*5*time.Hour {
log.Println("Timestamp in running week, cannot split!")
}
for t := lastWeek; t.Before(time.Now()); t = t.Add(7 * 24 * time.Hour) {
weeks = append(weeks, t)
}
log.Println(weeks)
return weeks
}
func getMonday(ts time.Time) time.Time {
if ts.Weekday() != time.Monday {
if ts.Weekday() == time.Sunday {
ts = ts.AddDate(0, 0, -6)
} else {
ts = ts.AddDate(0, 0, -int(ts.Weekday()-1))
}
}
return ts
}

13
Backend/endpoints/time-create.go
View File

@@ -33,7 +33,7 @@ func TimeCreateHandler(w http.ResponseWriter, r *http.Request) {
// Creates a booking from the http query params -> no body needed
// after that entry wi'll be written to database and the booking is returned as json
func createBooking(w http.ResponseWriter, r *http.Request) {
if !checkPassword(r) {
if !verifyToken(r) {
log.Println("Wrong or no API key provided!")
http.Error(w, "Wrong or no API key provided", http.StatusUnauthorized)
return
@@ -58,16 +58,15 @@ func createBooking(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadRequest)
}
func checkPassword(r *http.Request) bool {
func verifyToken(r *http.Request) bool {
authToken := helper.GetEnv("API_TOKEN", "dont_access")
authHeaders := r.Header.Get("Authorization")
_authStart := len("Bearer ")
if len(authHeaders) <= _authStart {
if len(authHeaders) <= 7 { //len "Bearer "
authHeaders = r.URL.Query().Get("api_key")
_authStart = 0
if len(authHeaders) <= _authStart {
if len(authHeaders) <= 0 {
return false
}
return authToken == authHeaders
}
return authToken == authHeaders[_authStart:]
return authToken == authHeaders[7:]
}

12
Backend/endpoints/time.go
View File

@@ -34,16 +34,16 @@ func TimeHandler(w http.ResponseWriter, r *http.Request) {
}
}
func parseTimestamp(r *http.Request, get_key string, fallback string) (time.Time, error) {
_timestamp_get := r.URL.Query().Get(get_key)
if _timestamp_get == "" {
_timestamp_get = fallback
func parseTimestamp(r *http.Request, getKey string, fallback string) (time.Time, error) {
getTimestamp := r.URL.Query().Get(getKey)
if getTimestamp == "" {
getTimestamp = fallback
}
timestamp_get, err := time.Parse("2006-01-02", _timestamp_get)
Timestamp, err := time.Parse("2006-01-02", getTimestamp)
if err != nil {
return time.Now(), err
}
return timestamp_get, nil
return Timestamp, nil
}
// Returns bookings from DB with similar card uid -> checks for card uid in http query params