coopgo-apps
/
parcoursmob
6
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Remove all fmr.Println and add zerolog logging
Build and Push Docker Image / build_and_push (push) Failing after 1m52s Details

This commit is contained in:
Arnaud Delcasse 2024-11-11 19:50:17 +01:00
parent a51f077358
commit a8acc9950a
30 changed files with 333 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
go.mod
View File

@ -45,7 +45,7 @@ require (
github.com/agext/levenshtein v1.2.1 // indirect github.com/agext/levenshtein v1.2.1 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.2 // indirect github.com/go-jose/go-jose/v4 v4.0.2 // indirect
@ -65,6 +65,8 @@ require (
github.com/leodido/go-urn v1.2.1 // indirect github.com/leodido/go-urn v1.2.1 // indirect
github.com/lib/pq v1.10.9 // indirect github.com/lib/pq v1.10.9 // indirect
github.com/magiconair/properties v1.8.7 // indirect github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 // indirect github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 // indirect
github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect github.com/minio/sha256-simd v1.0.0 // indirect
@ -78,7 +80,8 @@ require (
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/richardlehane/mscfb v1.0.4 // indirect github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.3 // indirect github.com/richardlehane/msoleps v1.0.3 // indirect
github.com/rs/xid v1.4.0 // indirect github.com/rs/xid v1.5.0 // indirect
github.com/rs/zerolog v1.33.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/sergi/go-diff v1.1.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect github.com/sirupsen/logrus v1.9.3 // indirect
@ -105,7 +108,7 @@ require (
golang.org/x/crypto v0.25.0 // indirect golang.org/x/crypto v0.25.0 // indirect
golang.org/x/net v0.27.0 // indirect golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.16.0 // indirect golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect

17
go.sum
View File

@ -98,6 +98,8 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo= github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -283,8 +285,14 @@ github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 h1:VCgV+ng800r1/AChRHzHbWCtQI06cPxoZQUljQHTyXc= github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 h1:VCgV+ng800r1/AChRHzHbWCtQI06cPxoZQUljQHTyXc=
github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1/go.mod h1:IhobDa5AIyiMAsnH/qkytD0NbG0JMOJ2ihQqe1NdXyg= github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1/go.mod h1:IhobDa5AIyiMAsnH/qkytD0NbG0JMOJ2ihQqe1NdXyg=
@ -356,6 +364,10 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE=
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
@ -634,11 +646,16 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=

5
handlers/api/cache.go
View File

@ -2,10 +2,11 @@ package api
import ( import (
"encoding/json" "encoding/json"
"fmt"
"net/http" "net/http"
"strconv" "strconv"
"github.com/rs/zerolog/log"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )
@ -18,7 +19,7 @@ func (h APIHandler) GetCache(w http.ResponseWriter, r *http.Request) {
go func() { go func() {
d, err := h.cache.Get(cacheid) d, err := h.cache.Get(cacheid)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
ch <- nil ch <- nil
return return

6
handlers/api/export.go
View File

@ -8,6 +8,7 @@ import (
"strconv" "strconv"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
) )
type FlatMaps []map[string]any type FlatMaps []map[string]any
@ -48,7 +49,7 @@ func (h APIHandler) CacheExport(w http.ResponseWriter, r *http.Request) {
d, err := h.cache.Get(cacheid) d, err := h.cache.Get(cacheid)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Error getting cache")
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
return return
} }
@ -56,7 +57,6 @@ func (h APIHandler) CacheExport(w http.ResponseWriter, r *http.Request) {
if data, ok := d.([]any); ok { if data, ok := d.([]any); ok {
flatmaps := FlatMaps{} flatmaps := FlatMaps{}
//fmt.Println(data)
for _, v := range data { for _, v := range data {
fm := map[string]any{} fm := map[string]any{}
@ -90,7 +90,7 @@ func flatten(prefix string, src map[string]any, dest map[string]any) {
dest[prefix+k+"."+strconv.Itoa(i)] = child[i] dest[prefix+k+"."+strconv.Itoa(i)] = child[i]
} }
default: default:
fmt.Println(prefix+k, " : ", v) // log.Trace().Str("key", prefix+k).Any("value", v).Msg("")
dest[prefix+k] = v dest[prefix+k] = v
} }
} }

15
handlers/api/oidc.go
View File

@ -2,15 +2,15 @@ package api
import ( import (
"context" "context"
"fmt"
"net/http" "net/http"
"github.com/rs/zerolog/log"
) )
func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) { func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
oauth2Token, err := h.idp.OAuth2Config.Exchange(context.Background(), r.URL.Query().Get("code")) oauth2Token, err := h.idp.OAuth2Config.Exchange(context.Background(), r.URL.Query().Get("code"))
if err != nil { if err != nil {
fmt.Println("Exchange error") log.Error().Err(err).Msg("Exchange error")
fmt.Println(err)
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -18,17 +18,14 @@ func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
// Extract the ID Token from OAuth2 token. // Extract the ID Token from OAuth2 token.
rawIDToken, ok := oauth2Token.Extra("id_token").(string) rawIDToken, ok := oauth2Token.Extra("id_token").(string)
if !ok { if !ok {
fmt.Println("issue retrieving token") log.Error().Msg("Cannot retrieve ID token")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
fmt.Println(rawIDToken)
_, err = h.idp.TokenVerifier.Verify(context.Background(), rawIDToken) _, err = h.idp.TokenVerifier.Verify(context.Background(), rawIDToken)
if err != nil { if err != nil {
fmt.Println("not able to verify token") log.Error().Err(err).Msg("Not able to verify token")
fmt.Println(err)
w.WriteHeader(http.StatusUnauthorized) w.WriteHeader(http.StatusUnauthorized)
return return
} }
@ -44,7 +41,7 @@ func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
} }
if err = session.Save(r, w); err != nil { if err = session.Save(r, w); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Cannot save session")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

50
handlers/application/administration.go
View File

@ -24,6 +24,7 @@ import (
mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
) )
@ -101,7 +102,14 @@ func (h *ApplicationHandler) Administration(w http.ResponseWriter, r *http.Reque
}() }()
wg.Wait() wg.Wait()
if accountsErr != nil || beneficiariesErr != nil || bookingsErr != nil || groupsResponseErr != nil || eventsResponseErr != nil { if accountsErr != nil || beneficiariesErr != nil || bookingsErr != nil || groupsResponseErr != nil || eventsResponseErr != nil {
fmt.Println(accountsErr, beneficiariesErr, bookingsErr, groupsResponseErr, eventsResponseErr, groupsBatchErr) log.Error().
Any("accounts error", accountsErr).
Any("beneficiaries error", beneficiariesErr).
Any("bookings error", bookingsErr).
Any("groups response error", groupsResponseErr).
Any("events response error", eventsResponseErr).
Any("groups batch error", groupsBatchErr).
Msg("Error in retrieving administration data")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -114,7 +122,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
if r.FormValue("name") == "" { if r.FormValue("name") == "" {
fmt.Println("invalid name") log.Error().Str("name", r.FormValue("name")).Msg("Invalid name")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -141,7 +149,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Cannot create PB struct from data map")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -163,7 +171,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
go func() { go func() {
_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization) _, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - AddGroup")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -172,7 +180,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
go func() { go func() {
_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_role) _, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_role)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - AddGroup")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -193,14 +201,14 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r
resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
groupmembers, admins, err := h.groupmembers(groupid) groupmembers, admins, err := h.groupmembers(groupid)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("inssue retrieving group members")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -223,7 +231,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -250,14 +258,12 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
}, },
) )
fmt.Println(err)
data := map[string]any{ data := map[string]any{
"group": groupresp.Group.ToStorageType().Data["name"], "group": groupresp.Group.ToStorageType().Data["name"],
} }
if err := h.emailing.Send("onboarding.existing_administrator", r.FormValue("username"), data); err != nil { if err := h.emailing.Send("onboarding.existing_administrator", r.FormValue("username"), data); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Cannot send email")
} }
http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound) http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
@ -272,7 +278,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
b := make([]byte, 16) b := make([]byte, 16)
if _, err := io.ReadFull(rand.Reader, b); err != nil { if _, err := io.ReadFull(rand.Reader, b); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue creating random bytes")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -286,7 +292,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
} }
if err := h.emailing.Send("onboarding.new_administrator", r.FormValue("username"), data); err != nil { if err := h.emailing.Send("onboarding.new_administrator", r.FormValue("username"), data); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Cannot send email")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -310,7 +316,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -402,7 +408,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
} }
reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest) reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Fleets service - GetVehicles")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
@ -440,7 +446,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
Groupids: administrators, Groupids: administrators,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - GetGroupsBatch")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -465,7 +471,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
} }
reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest) reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Fleets service - GetVehicles")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -491,7 +497,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
Namespaces: []string{"parcoursmob_organizations"}, Namespaces: []string{"parcoursmob_organizations"},
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Groups management service - GetGroups")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -504,7 +510,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
Accountids: beneficiaries_ids, Accountids: beneficiaries_ids,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Mobility accounts service - GetAccountsBatch")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -533,7 +539,7 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
members, err := h.members() members, err := h.members()
if err != nil { if err != nil {
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Cannot get members")
return nil, nil, err return nil, nil, err
} }
} }
@ -559,7 +565,7 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
func (h ApplicationHandler) AdminStatBeneficaires(w http.ResponseWriter, r *http.Request) { func (h ApplicationHandler) AdminStatBeneficaires(w http.ResponseWriter, r *http.Request) {
beneficiaries, err := h.services.GetBeneficiaries() beneficiaries, err := h.services.GetBeneficiaries()
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Cannot get beneficiaries")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -574,7 +580,7 @@ func (h ApplicationHandler) AdminStatEvents(w http.ResponseWriter, r *http.Reque
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("Issue in Agenda service - GetEvents")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

83
handlers/application/agenda.go
View File

@ -22,6 +22,7 @@ import (
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )
@ -46,7 +47,7 @@ func (h *ApplicationHandler) AgendaHome(w http.ResponseWriter, r *http.Request)
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -81,7 +82,7 @@ func (h *ApplicationHandler) AgendaHistory(w http.ResponseWriter, r *http.Reques
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -122,7 +123,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
eventForm, err := parseEventsForm(r) eventForm, err := parseEventsForm(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -151,7 +152,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.Agenda.CreateEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.CreateEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -160,7 +161,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
if strings.HasPrefix(contentType, "multipart/form-data") { if strings.HasPrefix(contentType, "multipart/form-data") {
err = r.ParseMultipartForm(100 * 1024 * 1024) // 100 MB limit err = r.ParseMultipartForm(100 * 1024 * 1024) // 100 MB limit
if err != nil { if err != nil {
fmt.Println("Error parsing multipart form:", err) log.Error().Err(err).Msg("Error parsing multipart form")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -171,7 +172,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
document_type := r.FormValue("file_type") document_type := r.FormValue("file_type")
document_name := r.FormValue("file_name") document_name := r.FormValue("file_name")
fileid := uuid.NewString() fileid := uuid.NewString()
metadata := map[string]string{ metadata := map[string]string{
@ -180,12 +181,12 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
} }
if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", resp.Event.Id, fileid, header.Filename), header.Size, metadata); err != nil { if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", resp.Event.Id, fileid, header.Filename), header.Size, metadata); err != nil {
fmt.Println("Error uploading file:", err) log.Error().Err(err).Msg("Error uploading file")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
} else if err != http.ErrMissingFile { } else if err != http.ErrMissingFile {
fmt.Println("Error retrieving file:", err) log.Error().Err(err).Msg("Error retrieving file")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -208,7 +209,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -219,7 +220,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest) groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -246,7 +247,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
g := r.Context().Value(identification.GroupKey) g := r.Context().Value(identification.GroupKey)
if g == nil { if g == nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -275,7 +276,6 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
} }
} }
documents := h.filestorage.List(filestorage.PREFIX_AGENDA + "/" + eventid) documents := h.filestorage.List(filestorage.PREFIX_AGENDA + "/" + eventid)
events_file_types := h.config.GetStringSlice("modules.agenda.documents_types") events_file_types := h.config.GetStringSlice("modules.agenda.documents_types")
@ -287,13 +287,13 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http.Request) {
current_group, err := h.currentGroup(r) current_group, err := h.currentGroup(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
current_user_token, current_user_claims, err := h.currentUser(r) current_user_token, current_user_claims, err := h.currentUser(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -301,7 +301,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
eventid := vars["eventid"] eventid := vars["eventid"]
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -321,7 +321,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
} }
datapb, err := structpb.NewStruct(data) datapb, err := structpb.NewStruct(data)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -334,7 +334,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
_, err = h.services.GRPC.Agenda.SubscribeEvent(context.TODO(), request) _, err = h.services.GRPC.Agenda.SubscribeEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -410,7 +410,7 @@ func contains(s []*agenda.Subscription, e string) bool {
return false return false
} }
///////////////////////////////Update Event///////////////////////////////////////// // /////////////////////////////Update Event/////////////////////////////////////////
func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request) {
adm := strings.Split(r.URL.Path, "/") adm := strings.Split(r.URL.Path, "/")
eventID := adm[3] eventID := adm[3]
@ -420,7 +420,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -435,7 +435,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
eventForm, err := parseEventsForm(r) eventForm, err := parseEventsForm(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -466,7 +466,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -487,7 +487,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -517,7 +517,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
_, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request) _, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -528,7 +528,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
h.Renderer.AgendaDeleteEvent(w, r, resp.Event.ToStorageType()) h.Renderer.AgendaDeleteEvent(w, r, resp.Event.ToStorageType())
} }
///////////////////////////Delete subscriber/////////////////////////////// // /////////////////////////Delete subscriber///////////////////////////////
func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
eventId := vars["eventid"] eventId := vars["eventid"]
@ -544,7 +544,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -566,14 +566,14 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
current_group, err := h.currentGroup(r) current_group, err := h.currentGroup(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
current_user_token, current_user_claims, err := h.currentUser(r) current_user_token, current_user_claims, err := h.currentUser(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -606,7 +606,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
datapb, err := structpb.NewStruct(data) datapb, err := structpb.NewStruct(data)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -627,18 +627,18 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
// récupérer l'adresse mail de l'utilisateur qui a créé l'événement // récupérer l'adresse mail de l'utilisateur qui a créé l'événement
mail := s_b_email mail := s_b_email
fmt.Println(mail) log.Debug().Str("mail", mail).Msg("Email content")
_, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request) _, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
if err := h.emailing.Send("delete_subscriber.request", mail, data); err != nil { if err := h.emailing.Send("delete_subscriber.request", mail, data); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -649,7 +649,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
h.Renderer.AgendaDeleteSubscribeEvent(w, r, eventId) h.Renderer.AgendaDeleteSubscribeEvent(w, r, eventId)
} }
//////////////////////////////////////////////////////// // //////////////////////////////////////////////////////
// /////////////////////History Event//////////////////////// // /////////////////////History Event////////////////////////
func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
@ -660,7 +660,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request) resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -671,7 +671,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest) groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -698,7 +698,6 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
g := r.Context().Value(identification.GroupKey) g := r.Context().Value(identification.GroupKey)
if g == nil { if g == nil {
fmt.Println(err)
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -729,7 +728,8 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
h.Renderer.AgendaHistoryEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts) h.Renderer.AgendaHistoryEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
} }
////// ADD DOCUMENTS //////
// //// ADD DOCUMENTS //////
func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
eventID := vars["eventid"] eventID := vars["eventid"]
@ -742,7 +742,7 @@ func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Reque
file, header, err := r.FormFile("file-upload") file, header, err := r.FormFile("file-upload")
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return return
} }
defer file.Close() defer file.Close()
@ -755,7 +755,7 @@ func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Reque
} }
if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", eventID, fileid, header.Filename), header.Size, metadata); err != nil { if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", eventID, fileid, header.Filename), header.Size, metadata); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -764,7 +764,6 @@ func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Reque
} }
func (h *ApplicationHandler) EventDocumentDownload(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) EventDocumentDownload(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
eventID := vars["eventid"] eventID := vars["eventid"]
@ -772,18 +771,18 @@ func (h *ApplicationHandler) EventDocumentDownload(w http.ResponseWriter, r *htt
file, info, err := h.filestorage.Get(filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s", eventID, document)) file, info, err := h.filestorage.Get(filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s", eventID, document))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
w.Header().Set("Content-Type", info.ContentType) w.Header().Set("Content-Type", info.ContentType)
if _, err = io.Copy(w, file); err != nil { if _, err = io.Copy(w, file); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound) http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound)
} }

50
handlers/application/beneficiaries.go
View File

@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"image/png" "image/png"
"io" "io"
"log"
"net/http" "net/http"
"sort" "sort"
"strconv" "strconv"
@ -30,6 +29,7 @@ import (
mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
) )
@ -109,7 +109,7 @@ func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Re
accounts, err := h.beneficiaries(r) accounts, err := h.beneficiaries(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -124,7 +124,7 @@ func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Re
func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Request) {
g := r.Context().Value(identification.GroupKey) g := r.Context().Value(identification.GroupKey)
if g == nil { if g == nil {
fmt.Println("Create beneficiary : could not find group") log.Error().Msg("Create beneficiary : could not find group")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -135,14 +135,14 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
dataMap, err := parseBeneficiariesForm(r) dataMap, err := parseBeneficiariesForm(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -157,7 +157,7 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -170,7 +170,7 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe) _, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -194,7 +194,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -205,7 +205,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
subcriptionresp, err := h.services.GRPC.Agenda.GetSubscriptionByUser(context.TODO(), subscriptionrequest) subcriptionresp, err := h.services.GRPC.Agenda.GetSubscriptionByUser(context.TODO(), subscriptionrequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -219,7 +219,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
} }
eventresp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), eventresquest) eventresp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), eventresquest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -233,7 +233,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
} }
bookingsresp, err := h.services.GRPC.Fleets.GetDriverBookings(context.TODO(), bookingsrequest) bookingsresp, err := h.services.GRPC.Fleets.GetDriverBookings(context.TODO(), bookingsrequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -281,7 +281,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
GetVehiculeResp, err := h.services.GRPC.Fleets.GetVehicle(context.Background(), GetVehiculeRequest) GetVehiculeResp, err := h.services.GRPC.Fleets.GetVehicle(context.Background(), GetVehiculeRequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -317,7 +317,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
groupsresp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), groupsrequest) groupsresp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), groupsrequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
organizations := []any{} organizations := []any{}
@ -339,14 +339,14 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
dataMap, err := parseBeneficiariesForm(r) dataMap, err := parseBeneficiariesForm(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -362,7 +362,7 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -378,7 +378,7 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -399,7 +399,7 @@ func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.R
resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -412,13 +412,13 @@ func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.R
buffer := new(bytes.Buffer) buffer := new(bytes.Buffer)
if err := png.Encode(buffer, picture); err != nil { if err := png.Encode(buffer, picture); err != nil {
log.Println("unable to encode image.") log.Error().Err(err).Msg("unable to encode image.")
} }
w.Header().Set("Content-Type", "image/png") w.Header().Set("Content-Type", "image/png")
w.Header().Set("Content-Length", strconv.Itoa(len(buffer.Bytes()))) w.Header().Set("Content-Length", strconv.Itoa(len(buffer.Bytes())))
if _, err := w.Write(buffer.Bytes()); err != nil { if _, err := w.Write(buffer.Bytes()); err != nil {
log.Println("unable to write image.") log.Error().Err(err).Msg("unable to write image.")
} }
} }
@ -434,7 +434,7 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
file, header, err := r.FormFile("file-upload") file, header, err := r.FormFile("file-upload")
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return return
} }
defer file.Close() defer file.Close()
@ -446,10 +446,10 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
"name": document_name, "name": document_name,
} }
fmt.Println("metadata", metadata) log.Debug().Any("metadata", metadata).Msg("Metadata")
if err := h.filestorage.Put(file, filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s_%s", beneficiaryID, fileid, header.Filename), header.Size, metadata); err != nil { if err := h.filestorage.Put(file, filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s_%s", beneficiaryID, fileid, header.Filename), header.Size, metadata); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -465,14 +465,14 @@ func (h *ApplicationHandler) BeneficiaryDocumentDownload(w http.ResponseWriter,
file, info, err := h.filestorage.Get(filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s", beneficiaryID, document)) file, info, err := h.filestorage.Get(filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s", beneficiaryID, document))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
w.Header().Set("Content-Type", info.ContentType) w.Header().Set("Content-Type", info.ContentType)
if _, err = io.Copy(w, file); err != nil { if _, err = io.Copy(w, file); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

12
handlers/application/dashboard.go
View File

@ -2,7 +2,6 @@ package application
import ( import (
"context" "context"
"fmt"
"net/http" "net/http"
"sort" "sort"
@ -10,11 +9,12 @@ import (
"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting" "git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi" agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
agendastorage "git.coopgo.io/coopgo-platform/agenda/storage" agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
"git.coopgo.io/coopgo-platform/groups-management/storage"
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"google.golang.org/protobuf/types/known/timestamppb"
fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi" fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage" fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage"
"git.coopgo.io/coopgo-platform/groups-management/storage"
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/timestamppb"
) )
func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
@ -33,7 +33,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
resp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -56,7 +56,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
members, _, err := h.groupmembers(group.ID) members, _, err := h.groupmembers(group.ID)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

14
handlers/application/group.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"crypto/rand" "crypto/rand"
"encoding/base64" "encoding/base64"
"fmt"
"io" "io"
"net/http" "net/http"
"time" "time"
@ -12,6 +11,7 @@ import (
"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification" "git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
"git.coopgo.io/coopgo-platform/groups-management/storage" "git.coopgo.io/coopgo-platform/groups-management/storage"
accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"github.com/rs/zerolog/log"
) )
func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http.Request) {
@ -26,7 +26,7 @@ func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http
members, err := h.members() members, err := h.members()
if err != nil { if err != nil {
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -81,14 +81,16 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
}, },
) )
fmt.Println(err) if err != nil {
log.Error().Err(err).Msg("")
}
data := map[string]any{ data := map[string]any{
"group": group.Data["name"], "group": group.Data["name"],
} }
if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil { if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
http.Redirect(w, r, "/app/group/settings", http.StatusFound) http.Redirect(w, r, "/app/group/settings", http.StatusFound)
@ -103,7 +105,7 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
b := make([]byte, 16) b := make([]byte, 16)
if _, err := io.ReadFull(rand.Reader, b); err != nil { if _, err := io.ReadFull(rand.Reader, b); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -117,7 +119,7 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
} }
if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil { if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

21
handlers/application/group_module.go
View File

@ -14,6 +14,7 @@ import (
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
) )
@ -45,7 +46,7 @@ func (h *ApplicationHandler) Groups(w http.ResponseWriter, r *http.Request) {
resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -73,14 +74,12 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
r.ParseForm() r.ParseForm()
if r.FormValue("name") == "" { if r.FormValue("name") == "" {
log.Error().Msg("Invalid name")
fmt.Println("invalid name")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
if r.FormValue("type") == "" { if r.FormValue("type") == "" {
log.Error().Msg("Invalid type")
fmt.Println("invalid type")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -96,7 +95,7 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -111,7 +110,7 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization) _, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -145,7 +144,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -186,7 +185,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary) respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -201,7 +200,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe) _, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -212,7 +211,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
accountsBeneficaire, err := h.beneficiaries(r) accountsBeneficaire, err := h.beneficiaries(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }

63
handlers/application/journeys.go
View File

@ -17,6 +17,7 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
geojson "github.com/paulmach/go.geojson" geojson "github.com/paulmach/go.geojson"
"github.com/rs/zerolog/log"
"gitlab.scity.coop/maas/navitia-golang" "gitlab.scity.coop/maas/navitia-golang"
"gitlab.scity.coop/maas/navitia-golang/types" "gitlab.scity.coop/maas/navitia-golang/types"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
@ -37,9 +38,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
carpoolCh := make(chan any, 1) carpoolCh := make(chan any, 1)
locTime, errTime := time.LoadLocation("Europe/Paris") locTime, errTime := time.LoadLocation("Europe/Paris")
if errTime != nil { if errTime != nil {
fmt.Println("Loading timezone location Europe/Paris error : ") log.Panic().Err(errTime).Msg("Tried to load timezone location Europe/Paris. Error. Missing zones in container ?")
fmt.Println("Missing zones in container ? ")
panic(errTime)
} }
departuredate := r.FormValue("departuredate") departuredate := r.FormValue("departuredate")
@ -66,14 +65,14 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
departuregeo, err = geojson.UnmarshalFeature([]byte(departure)) departuregeo, err = geojson.UnmarshalFeature([]byte(departure))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
destinationgeo, err = geojson.UnmarshalFeature([]byte(destination)) destinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -85,7 +84,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
"https://api.navitia.io/v1", "https://api.navitia.io/v1",
&http.Client{}) &http.Client{})
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
navitiaCh <- nil navitiaCh <- nil
return return
@ -100,7 +99,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
journeys, err = session.Journeys(context.Background(), request) journeys, err = session.Journeys(context.Background(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
// w.WriteHeader(http.StatusBadRequest) // w.WriteHeader(http.StatusBadRequest)
// return // return
} }
@ -115,7 +114,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
client := &http.Client{} client := &http.Client{}
req, err := http.NewRequest("GET", carpoolrequest, nil) req, err := http.NewRequest("GET", carpoolrequest, nil)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
req.URL.RawQuery = fmt.Sprintf( req.URL.RawQuery = fmt.Sprintf(
@ -127,13 +126,13 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
req.Header.Set("X-API-KEY", "123456") req.Header.Set("X-API-KEY", "123456")
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
if err == nil && resp.StatusCode == http.StatusOK { if err == nil && resp.StatusCode == http.StatusOK {
err = json.NewDecoder(resp.Body).Decode(&carpoolresults) err = json.NewDecoder(resp.Body).Decode(&carpoolresults)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
if carpoolresults == nil { if carpoolresults == nil {
@ -152,7 +151,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
} }
vehicleresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), vehiclerequest) vehicleresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), vehiclerequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
for _, vehicle := range vehicleresp.Vehicles { for _, vehicle := range vehicleresp.Vehicles {
@ -190,7 +189,7 @@ func (h *ApplicationHandler) GroupsGestion(w http.ResponseWriter, r *http.Reques
resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -241,7 +240,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary) respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -258,14 +257,14 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
departurgeo, err = geojson.UnmarshalFeature([]byte(departure)) departurgeo, err = geojson.UnmarshalFeature([]byte(departure))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
dstinationgeo, err = geojson.UnmarshalFeature([]byte(destination)) dstinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -286,14 +285,14 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
if r.FormValue("name") == "" { if r.FormValue("name") == "" {
fmt.Println("invalid name") log.Error().Msg("invalid name")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
if r.FormValue("number") == "" { if r.FormValue("number") == "" {
fmt.Println("invalid number of personne") log.Error().Msg("invalid number of personne")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -330,7 +329,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -345,7 +344,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization) _, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -357,7 +356,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
} }
accountsBeneficaire, err := h.beneficiaries(r) accountsBeneficaire, err := h.beneficiaries(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -376,7 +375,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -413,7 +412,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary) respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -428,7 +427,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe) _, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -454,7 +453,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
id := uuid.NewString() id := uuid.NewString()
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -470,7 +469,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
_, err = h.services.GRPC.GroupsManagement.AddGroupMember(context.TODO(), request_organizatio) _, err = h.services.GRPC.GroupsManagement.AddGroupMember(context.TODO(), request_organizatio)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -485,7 +484,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
// } // }
// s, err := h.services.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), grp) // s, err := h.services.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), grp)
// if err != nil { // if err != nil {
// fmt.Println(err) // log.Error().Err(err).Msg("")
// w.WriteHeader(http.StatusInternalServerError) // w.WriteHeader(http.StatusInternalServerError)
// return // return
// } // }
@ -499,12 +498,10 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
//////////find all groups to store the adresse passenger/////// //////////find all groups to store the adresse passenger///////
///////////try to optimise the code //////////////////////////// ///////////try to optimise the code ////////////////////////////
groups, _ := h.services.GetGroupsMemberMap(resp.Group.ToStorageType().ID) groups, _ := h.services.GetGroupsMemberMap(resp.Group.ToStorageType().ID)
//fmt.Println(groups)
var number string = strconv.Itoa(len(resp.Group.Members)) var number string = strconv.Itoa(len(resp.Group.Members))
/////////////////////
accountsBeneficaire, err := h.beneficiaries(r) accountsBeneficaire, err := h.beneficiaries(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -527,7 +524,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -540,7 +537,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
ressp, err := h.services.GRPC.GroupsManagement.GetGroupMember(context.TODO(), reequest) ressp, err := h.services.GRPC.GroupsManagement.GetGroupMember(context.TODO(), reequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -550,7 +547,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
_, errr := h.services.GRPC.GroupsManagement.UnsubscribeMember(context.TODO(), req) _, errr := h.services.GRPC.GroupsManagement.UnsubscribeMember(context.TODO(), req)
if errr != nil { if errr != nil {
fmt.Println(errr) log.Error().Err(errr).Msg("Issue in groups management service - InsubscribeMember")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -567,7 +564,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
_, err := h.services.GRPC.GroupsManagement.Unsubscribe(context.TODO(), reequest) _, err := h.services.GRPC.GroupsManagement.Unsubscribe(context.TODO(), reequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

19
handlers/application/members.go
View File

@ -12,6 +12,7 @@ import (
groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi" groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
) )
@ -35,7 +36,7 @@ func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Reques
resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -54,7 +55,7 @@ func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Reques
res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques) res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -77,14 +78,14 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
dataMap, err := parseUserForm(r) dataMap, err := parseUserForm(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -100,7 +101,7 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -116,7 +117,7 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -160,7 +161,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)
accounts, err := h.services.GetAccounts() accounts, err := h.services.GetAccounts()
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -174,7 +175,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)
resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request) resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -195,7 +196,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)
res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques) res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

6
handlers/application/support.go
View File

@ -1,10 +1,10 @@
package application package application
import ( import (
"fmt"
"net/http" "net/http"
"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification" "git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
"github.com/rs/zerolog/log"
) )
type Message struct { type Message struct {
@ -15,7 +15,7 @@ func (h *ApplicationHandler) SupportSend(w http.ResponseWriter, r *http.Request)
c := r.Context().Value(identification.ClaimsKey) c := r.Context().Value(identification.ClaimsKey)
if c == nil { if c == nil {
fmt.Println("no current user claims") log.Error().Msg("no current user claims")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -30,7 +30,7 @@ func (h *ApplicationHandler) SupportSend(w http.ResponseWriter, r *http.Request)
} }
if err := h.emailing.Send("support.request", "support@parcoursmob.fr", data); err != nil { if err := h.emailing.Send("support.request", "support@parcoursmob.fr", data); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
http.Redirect(w, r, "/app/", http.StatusFound) http.Redirect(w, r, "/app/", http.StatusFound)

87
handlers/application/vehicles-management.go
View File

@ -17,9 +17,10 @@ import (
"git.coopgo.io/coopgo-platform/groups-management/storage" "git.coopgo.io/coopgo-platform/groups-management/storage"
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )
@ -31,7 +32,7 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
} }
resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
@ -72,7 +73,7 @@ func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWrite
} }
resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
@ -111,7 +112,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
group := g.(storage.Group) group := g.(storage.Group)
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -124,7 +125,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
var address map[string]any var address map[string]any
err := json.Unmarshal([]byte(v), &address) err := json.Unmarshal([]byte(v), &address)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -137,7 +138,6 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
dataMap["licence_plate"] = v dataMap["licence_plate"] = v
} }
if v := r.FormValue("automatic"); v != "" { if v := r.FormValue("automatic"); v != "" {
fmt.Println(v)
dataMap["automatic"] = (v == "on") dataMap["automatic"] = (v == "on")
} }
if v := r.FormValue("kilometers"); v != "" { if v := r.FormValue("kilometers"); v != "" {
@ -146,7 +146,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -166,7 +166,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
_, err = h.services.GRPC.Fleets.AddVehicle(context.TODO(), request) _, err = h.services.GRPC.Fleets.AddVehicle(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -189,7 +189,7 @@ func (h *ApplicationHandler) VehiclesFleetDisplay(w http.ResponseWriter, r *http
resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -220,7 +220,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
booking, err := h.services.GetBooking(bookingid) booking, err := h.services.GetBooking(bookingid)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -268,7 +268,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request) _, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -285,7 +285,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest) beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -299,7 +299,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest) groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -314,7 +314,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
alternativeresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), alternativerequest) alternativeresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), alternativerequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
alternatives := []any{} alternatives := []any{}
@ -339,7 +339,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons
booking, err := h.services.GetBooking(bookingid) booking, err := h.services.GetBooking(bookingid)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -354,7 +354,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons
_, err = h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request) _, err = h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -366,7 +366,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons
func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter, r *http.Request) { // Get Group func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter, r *http.Request) { // Get Group
g := r.Context().Value(identification.GroupKey) g := r.Context().Value(identification.GroupKey)
if g == nil { if g == nil {
fmt.Println("no current group") log.Error().Msg("no current group")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -375,7 +375,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
// Get current user ID // Get current user ID
u := r.Context().Value(identification.IdtokenKey) u := r.Context().Value(identification.IdtokenKey)
if u == nil { if u == nil {
fmt.Println("no current user") log.Error().Msg("no current user")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -384,7 +384,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
// Get current user claims // Get current user claims
c := r.Context().Value(identification.ClaimsKey) c := r.Context().Value(identification.ClaimsKey)
if c == nil { if c == nil {
fmt.Println("no current user claims") log.Error().Msg("no current user claims")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -419,7 +419,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
datapb, err := structpb.NewStruct(data) datapb, err := structpb.NewStruct(data)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -438,7 +438,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
_, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request) _, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -446,30 +446,6 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/fleet/%s", vehicleid), http.StatusFound) http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/fleet/%s", vehicleid), http.StatusFound)
} }
// func (h *ApplicationHandler) UnbookingVehicles(w http.ResponseWriter, r *http.Request) {
// request := &fleets.GetVehiclesRequest{
// Namespaces: []string{"parcoursmob"},
// }
// resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
// if err != nil {
// fmt.Println(err)
// w.WriteHeader(http.StatusInternalServerError)
// }
// vehicles := []fleetsstorage.Vehicle{}
// fmt.Println(resp.Vehicles[0].Bookings)
// for i, vehicle := range resp.Vehicles {
// if len(resp.Vehicles[i].Bookings) == 0 {
// v := vehicle.ToStorageType()
// vehicles = append(vehicles, v)
// }
// }
// // if len(resp.Vehicle.ToStorageType().Bookings) == 0 {
// // h.Renderer.UnbookingVehicles(w, r, resp.Vehicle.ToStorageType())
// // }
// // fmt.Println(resp.Vehicle.ToStorageType().Bookings)
// fmt.Println(vehicles)
// h.Renderer.UnbookingVehicles(w, r, vehicles)
// }
func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Request) { func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r) vars := mux.Vars(r)
bookingid := vars["bookingid"] bookingid := vars["bookingid"]
@ -480,7 +456,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -490,14 +466,14 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
current_group, err := h.currentGroup(r) current_group, err := h.currentGroup(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
current_user_token, current_user_claims, err := h.currentUser(r) current_user_token, current_user_claims, err := h.currentUser(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -537,7 +513,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
datapb, err := structpb.NewStruct(data) datapb, err := structpb.NewStruct(data)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -560,7 +536,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request) _, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -582,7 +558,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -593,7 +569,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
if r.Method == "POST" { if r.Method == "POST" {
fmt.Print(r.FormValue("vehicle_type")) fmt.Print(r.FormValue("vehicle_type"))
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -605,7 +581,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
var address map[string]any var address map[string]any
err := json.Unmarshal([]byte(v), &address) err := json.Unmarshal([]byte(v), &address)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -621,13 +597,12 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
dataMap["kilometers"] = v dataMap["kilometers"] = v
} }
if v := r.FormValue("automatic"); v != "" { if v := r.FormValue("automatic"); v != "" {
fmt.Println(v)
dataMap["automatic"] = (v == "on") dataMap["automatic"] = (v == "on")
} }
data, err := structpb.NewValue(dataMap) data, err := structpb.NewValue(dataMap)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -645,7 +620,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
resp, err := h.services.GRPC.Fleets.UpdateVehicle(context.TODO(), request) resp, err := h.services.GRPC.Fleets.UpdateVehicle(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

37
handlers/application/vehicles.go
View File

@ -20,6 +20,7 @@ import (
mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )
@ -52,7 +53,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary) respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -71,7 +72,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
@ -105,7 +106,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
accounts, err := h.beneficiaries(r) accounts, err := h.beneficiaries(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -116,7 +117,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
Groupids: administrators, Groupids: administrators,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -139,14 +140,14 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
fmt.Println("Book") fmt.Println("Book")
current_group, err := h.currentGroup(r) current_group, err := h.currentGroup(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
current_user_token, current_user_claims, err := h.currentUser(r) current_user_token, current_user_claims, err := h.currentUser(r)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -159,7 +160,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
Vehicleid: vehicleid, Vehicleid: vehicleid,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte("Vehicle not found")) w.Write([]byte("Vehicle not found"))
w.Write([]byte(err.Error())) w.Write([]byte(err.Error()))
@ -188,7 +189,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
} }
datapb, err := structpb.NewStruct(data) datapb, err := structpb.NewStruct(data)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -213,7 +214,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
if existing_file == "" { if existing_file == "" {
file, header, err := r.FormFile("doc-" + v) file, header, err := r.FormFile("doc-" + v)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("Document manquant : " + v)) w.Write([]byte("Document manquant : " + v))
return return
@ -228,7 +229,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
} }
if err := h.filestorage.Put(file, filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s_%s", booking.Id, fileid, header.Filename), header.Size, metadata); err != nil { if err := h.filestorage.Put(file, filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s_%s", booking.Id, fileid, header.Filename), header.Size, metadata); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -236,7 +237,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
path := strings.Split(existing_file, "/") path := strings.Split(existing_file, "/")
if err := h.filestorage.Copy(existing_file, fmt.Sprintf("%s/%s/%s", filestorage.PREFIX_BOOKINGS, booking.Id, path[len(path)-1])); err != nil { if err := h.filestorage.Copy(existing_file, fmt.Sprintf("%s/%s/%s", filestorage.PREFIX_BOOKINGS, booking.Id, path[len(path)-1])); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -245,7 +246,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
_, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request) _, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
@ -253,7 +254,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
//NOTIFY GROUP MEMBERS //NOTIFY GROUP MEMBERS
members, _, err := h.groupmembers(vehicle.Vehicle.Administrators[0]) members, _, err := h.groupmembers(vehicle.Vehicle.Administrators[0])
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} else { } else {
for _, m := range members { for _, m := range members {
if email, ok := m.Data["email"].(string); ok { if email, ok := m.Data["email"].(string); ok {
@ -277,7 +278,7 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
} }
resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -301,7 +302,7 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest) groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -325,7 +326,7 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
request := &fleets.GetBookingsRequest{} request := &fleets.GetBookingsRequest{}
resp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), request) resp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
return return
} }
@ -364,14 +365,14 @@ func (h *ApplicationHandler) BookingDocumentDownload(w http.ResponseWriter, r *h
file, info, err := h.filestorage.Get(filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s", bookingid, document)) file, info, err := h.filestorage.Get(filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s", bookingid, document))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
w.Header().Set("Content-Type", info.ContentType) w.Header().Set("Content-Type", info.ContentType)
if _, err = io.Copy(w, file); err != nil { if _, err = io.Copy(w, file); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

6
handlers/auth/groups.go
View File

@ -2,10 +2,10 @@ package auth
import ( import (
"context" "context"
"fmt"
"net/http" "net/http"
groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi" groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
"github.com/rs/zerolog/log"
) )
func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) { func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
@ -42,7 +42,7 @@ func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
err = idtoken.Claims(&claims) err = idtoken.Claims(&claims)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
g := claims["groups"] g := claims["groups"]
@ -65,7 +65,7 @@ func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
resp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), request) resp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

14
handlers/auth/lost_password.go
View File

@ -4,12 +4,12 @@ import (
"context" "context"
"crypto/rand" "crypto/rand"
"encoding/base64" "encoding/base64"
"fmt"
"io" "io"
"net/http" "net/http"
"time" "time"
"git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
"github.com/rs/zerolog/log"
) )
func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) { func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
@ -22,14 +22,14 @@ func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
Namespace: "parcoursmob", Namespace: "parcoursmob",
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
http.Redirect(w, r, "/app/", http.StatusFound) http.Redirect(w, r, "/app/", http.StatusFound)
return return
} }
b := make([]byte, 16) b := make([]byte, 16)
if _, err := io.ReadFull(rand.Reader, b); err != nil { if _, err := io.ReadFull(rand.Reader, b); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -44,7 +44,7 @@ func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
h.cache.PutWithTTL("retrieve-password/"+key, passwordretrieval, 72*time.Hour) h.cache.PutWithTTL("retrieve-password/"+key, passwordretrieval, 72*time.Hour)
if err := h.emailing.Send("auth.retrieve_password", email, passwordretrieval); err != nil { if err := h.emailing.Send("auth.retrieve_password", email, passwordretrieval); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -62,7 +62,7 @@ func (h *AuthHandler) LostPasswordRecover(w http.ResponseWriter, r *http.Request
key := r.FormValue("key") key := r.FormValue("key")
recover, err := h.cache.Get("retrieve-password/" + key) recover, err := h.cache.Get("retrieve-password/" + key)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
h.Renderer.LostPasswordRecoverKO(w, r, key) h.Renderer.LostPasswordRecoverKO(w, r, key)
return return
} }
@ -81,13 +81,13 @@ func (h *AuthHandler) LostPasswordRecover(w http.ResponseWriter, r *http.Request
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
err = h.cache.Delete("retrieve-password/" + key) err = h.cache.Delete("retrieve-password/" + key)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
http.Redirect(w, r, "/app/", http.StatusFound) http.Redirect(w, r, "/app/", http.StatusFound)

11
handlers/auth/onboarding.go
View File

@ -7,6 +7,7 @@ import (
mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
ma "git.coopgo.io/coopgo-platform/mobility-accounts/storage" ma "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/rs/zerolog/log"
) )
func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) { func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
@ -15,7 +16,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
key := r.FormValue("key") key := r.FormValue("key")
onboarding, err := h.cache.Get("onboarding/" + key) onboarding, err := h.cache.Get("onboarding/" + key)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
h.Renderer.AuthOnboardingKO(w, r, key) h.Renderer.AuthOnboardingKO(w, r, key)
return return
} }
@ -24,7 +25,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
if r.Method == "POST" { if r.Method == "POST" {
if r.FormValue("password") == "" { if r.FormValue("password") == "" {
fmt.Println("password is empty !") log.Error().Msg("Password is empty")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -58,7 +59,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
acc, err := mobilityaccounts.AccountFromStorageType(account) acc, err := mobilityaccounts.AccountFromStorageType(account)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -70,14 +71,14 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
_, err = h.services.GRPC.MobilityAccounts.Register(context.TODO(), request) _, err = h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
err = h.cache.Delete("onboarding/" + key) err = h.cache.Delete("onboarding/" + key)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
http.Redirect(w, r, "/app/", http.StatusFound) http.Redirect(w, r, "/app/", http.StatusFound)

16
handlers/exports/agenda.go
View File

@ -3,6 +3,9 @@ package exports
import ( import (
"context" "context"
"fmt" "fmt"
"net/http"
"sort"
"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting" "git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi" agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
agendastorage "git.coopgo.io/coopgo-platform/agenda/storage" agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
@ -11,9 +14,8 @@ import (
accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rs/zerolog/log"
"github.com/xuri/excelize/v2" "github.com/xuri/excelize/v2"
"net/http"
"sort"
) )
func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *http.Request) { func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *http.Request) {
@ -24,7 +26,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
Namespaces: []string{"parcoursmob_dispositifs"}, Namespaces: []string{"parcoursmob_dispositifs"},
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -59,7 +61,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
Accountids: beneficiaries_ids, Accountids: beneficiaries_ids,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -82,7 +84,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
Id: eventId, Id: eventId,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -107,7 +109,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
Accountids: beneficiaries_ids, Accountids: beneficiaries_ids,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -130,7 +132,7 @@ func (h *ExportsHandler) generateExcel(events []agendastorage.Event, groups map[
f := excelize.NewFile() f := excelize.NewFile()
defer func() { defer func() {
if err := f.Close(); err != nil { if err := f.Close(); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
}() }()
f.SetCellValue("Sheet1", "A1", "Evénement") f.SetCellValue("Sheet1", "A1", "Evénement")

13
handlers/exports/fleets.go
View File

@ -12,6 +12,7 @@ import (
groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage" groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi" accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
"github.com/rs/zerolog/log"
"github.com/xuri/excelize/v2" "github.com/xuri/excelize/v2"
) )
@ -24,7 +25,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
} }
reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest) reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -34,7 +35,6 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
for _, vehicle := range reesp.Vehicles { for _, vehicle := range reesp.Vehicles {
v := vehicle.ToStorageType() v := vehicle.ToStorageType()
fmt.Println(v)
for _, b := range v.Bookings { for _, b := range v.Bookings {
bookings = append(bookings, b) bookings = append(bookings, b)
@ -45,14 +45,13 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
} }
groups := map[string]groupsstorage.Group{} groups := map[string]groupsstorage.Group{}
admingroups, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), &groupsmanagement.GetGroupsRequest{ admingroups, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), &groupsmanagement.GetGroupsRequest{
Namespaces: []string{"parcoursmob_organizations"}, Namespaces: []string{"parcoursmob_organizations"},
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -65,7 +64,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
Accountids: beneficiaries_ids, Accountids: beneficiaries_ids,
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }
@ -80,7 +79,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
f := excelize.NewFile() f := excelize.NewFile()
defer func() { defer func() {
if err := f.Close(); err != nil { if err := f.Close(); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
}() }()
@ -127,7 +126,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
// filter by group // filter by group
g := r.Context().Value(identification.GroupKey) g := r.Context().Value(identification.GroupKey)
group := g.(groupsstorage.Group) group := g.(groupsstorage.Group)
if bookedbygroup != group.ID { if bookedbygroup != group.ID {
continue continue
} }

37
main.go
View File

@ -1,11 +1,13 @@
package main package main
import ( import (
"fmt"
"log"
"net/http" "net/http"
"os"
"time" "time"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"git.coopgo.io/coopgo-apps/parcoursmob/handlers/api" "git.coopgo.io/coopgo-apps/parcoursmob/handlers/api"
"git.coopgo.io/coopgo-apps/parcoursmob/handlers/application" "git.coopgo.io/coopgo-apps/parcoursmob/handlers/application"
"git.coopgo.io/coopgo-apps/parcoursmob/handlers/auth" "git.coopgo.io/coopgo-apps/parcoursmob/handlers/auth"
@ -18,6 +20,8 @@ import (
) )
func main() { func main() {
zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
cfg, err := ReadConfig() cfg, err := ReadConfig()
if err != nil { if err != nil {
@ -30,25 +34,30 @@ func main() {
templates_public_dir = cfg.GetString("templates.public_dir") templates_public_dir = cfg.GetString("templates.public_dir")
dev_env = cfg.GetBool("dev_env") dev_env = cfg.GetBool("dev_env")
) )
if dev_env {
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
}
svc, err := services.NewServicesHandler(cfg) svc, err := services.NewServicesHandler(cfg)
if err != nil { if err != nil {
panic(err) log.Panic().Err(err).Msg("Error creating services handler")
} }
kv, err := cache.NewKVHandler(cfg) kv, err := cache.NewKVHandler(cfg)
if err != nil { if err != nil {
panic(err) log.Panic().Err(err).Msg("Error creating KV handler")
} }
filestorage, _ := cache.NewFileStorage(cfg) filestorage, _ := cache.NewFileStorage(cfg)
idp, err := identification.NewIdentificationProvider(cfg, svc, kv) idp, err := identification.NewIdentificationProvider(cfg, svc, kv)
if err != nil { if err != nil {
panic(err) log.Panic().Err(err).Msg("Error creating identification provider")
} }
emailing, err := renderer.NewEmailingHandler(cfg) emailing, err := renderer.NewEmailingHandler(cfg)
if err != nil { if err != nil {
panic(err) log.Panic().Err(err).Msg("Error creating emailing handler")
} }
apiHandler, _ := api.NewAPIHandler(cfg, idp, svc, kv) apiHandler, _ := api.NewAPIHandler(cfg, idp, svc, kv)
@ -56,11 +65,6 @@ func main() {
exportsHandler, _ := exports.NewExportsHandler(cfg, svc, emailing) exportsHandler, _ := exports.NewExportsHandler(cfg, svc, emailing)
authHandler, _ := auth.NewAuthHandler(cfg, idp, svc, kv, emailing) authHandler, _ := auth.NewAuthHandler(cfg, idp, svc, kv, emailing)
fmt.Println("Running", service_name, ":")
if dev_env {
fmt.Printf("\033]0;%s\007", service_name)
}
r := mux.NewRouter() r := mux.NewRouter()
r.PathPrefix("/public/").Handler(http.StripPrefix("/public/", http.FileServer(http.Dir(templates_public_dir)))) r.PathPrefix("/public/").Handler(http.StripPrefix("/public/", http.FileServer(http.Dir(templates_public_dir))))
@ -72,7 +76,10 @@ func main() {
r.HandleFunc("/auth/groups/", authHandler.Groups) r.HandleFunc("/auth/groups/", authHandler.Groups)
r.HandleFunc("/auth/groups/switch", authHandler.GroupSwitch) r.HandleFunc("/auth/groups/switch", authHandler.GroupSwitch)
r.HandleFunc("/", redirectApp) r.HandleFunc("/", redirectApp)
//r.Use(trackPage)
if dev_env {
r.Use(trackPage)
}
api_router := r.PathPrefix("/api").Subrouter() api_router := r.PathPrefix("/api").Subrouter()
api_router.HandleFunc("/", apiHandler.NotFound) api_router.HandleFunc("/", apiHandler.NotFound)
@ -182,9 +189,9 @@ func main() {
ReadTimeout: 15 * time.Second, ReadTimeout: 15 * time.Second,
} }
fmt.Println("Running on ", address) log.Info().Str("service_name", service_name).Str("address", address).Msg("Running HTTP server")
log.Fatal(srv.ListenAndServe()) log.Fatal().Err(srv.ListenAndServe())
} }
@ -194,7 +201,7 @@ func redirectApp(w http.ResponseWriter, r *http.Request) {
func trackPage(next http.Handler) http.Handler { func trackPage(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Println(r.RequestURI) log.Trace().Str("requested_uri", r.RequestURI).Msg("New request")
next.ServeHTTP(w, r.WithContext(r.Context())) next.ServeHTTP(w, r.WithContext(r.Context()))
}) })
} }

5
renderer/renderer.go
View File

@ -10,6 +10,7 @@ import (
"git.coopgo.io/coopgo-platform/emailing" "git.coopgo.io/coopgo-platform/emailing"
"git.coopgo.io/coopgo-platform/groups-management/storage" "git.coopgo.io/coopgo-platform/groups-management/storage"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
"github.com/rs/zerolog/log"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -66,7 +67,7 @@ func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Req
err := t.ExecuteTemplate(w, "main", state) err := t.ExecuteTemplate(w, "main", state)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
} }
@ -95,7 +96,7 @@ func (renderer *Renderer) RenderNoLayout(name string, w http.ResponseWriter, r *
t = template.Must(t.ParseFiles(prefixed_files...)) t = template.Must(t.ParseFiles(prefixed_files...))
err := t.ExecuteTemplate(w, "main", state) err := t.ExecuteTemplate(w, "main", state)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
} }

4
services/fleets.go
View File

@ -2,12 +2,12 @@ package services
import ( import (
"context" "context"
"fmt"
"sort" "sort"
"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting" "git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi" fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
"git.coopgo.io/coopgo-platform/fleets/storage" "git.coopgo.io/coopgo-platform/fleets/storage"
"github.com/rs/zerolog/log"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
@ -62,7 +62,7 @@ func (s *ServicesHandler) GetVehiclesMap() (vehicles map[string]storage.Vehicle,
} }
resp, err := s.GRPC.Fleets.GetVehicles(context.TODO(), request) resp, err := s.GRPC.Fleets.GetVehicles(context.TODO(), request)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} else { } else {
for _, vehicle := range resp.Vehicles { for _, vehicle := range resp.Vehicles {
vehicles[vehicle.Id] = vehicle.ToStorageType() vehicles[vehicle.Id] = vehicle.ToStorageType()

3
utils/identification/groups.go
View File

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi" groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
"github.com/rs/zerolog/log"
) )
const GroupKey ContextKey = "group" const GroupKey ContextKey = "group"
@ -28,7 +29,7 @@ func (p *IdentificationProvider) GroupsMiddleware(next http.Handler) http.Handle
claimgroups, ok := claims["groups"].([]any) claimgroups, ok := claims["groups"].([]any)
if !ok { if !ok {
fmt.Println("cast issue") log.Error().Msg("cast issue")
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
return return
} }

6
utils/identification/oidc.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"crypto/rand" "crypto/rand"
"encoding/base64" "encoding/base64"
"fmt"
"io" "io"
"net/http" "net/http"
@ -12,6 +11,7 @@ import (
"git.coopgo.io/coopgo-apps/parcoursmob/utils/storage" "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/rs/zerolog/log"
"github.com/spf13/viper" "github.com/spf13/viper"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -91,7 +91,7 @@ func (p *IdentificationProvider) Middleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
session, err := p.SessionsStore.Get(r, "parcoursmob_session") session, err := p.SessionsStore.Get(r, "parcoursmob_session")
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
if session.Values["idtoken"] == nil || session.Values["idtoken"] == "" { if session.Values["idtoken"] == nil || session.Values["idtoken"] == "" {
@ -122,7 +122,7 @@ func (p *IdentificationProvider) Middleware(next http.Handler) http.Handler {
err = idtoken.Claims(&claims) err = idtoken.Claims(&claims)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
} }
ctx := context.WithValue(r.Context(), IdtokenKey, idtoken) ctx := context.WithValue(r.Context(), IdtokenKey, idtoken)

4
utils/profile-pictures/profile-pictures.go
View File

@ -1,12 +1,12 @@
package profilepictures package profilepictures
import ( import (
"fmt"
"image" "image"
"image/color" "image/color"
"image/draw" "image/draw"
"github.com/fogleman/gg" "github.com/fogleman/gg"
"github.com/rs/zerolog/log"
"golang.org/x/image/font" "golang.org/x/image/font"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
) )
@ -21,7 +21,7 @@ func DefaultProfilePicture(initials string) *image.RGBA {
ff, err := gg.LoadFontFace("themes/default/web/fonts/bitter.ttf", 150.0) ff, err := gg.LoadFontFace("themes/default/web/fonts/bitter.ttf", 150.0)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return img return img
} }

20
utils/storage/etcd.go
View File

@ -8,6 +8,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/rs/zerolog/log"
"github.com/spf13/viper" "github.com/spf13/viper"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace" "go.etcd.io/etcd/client/v3/namespace"
@ -74,9 +75,8 @@ func NewEtcdHandler(cfg *viper.Viper) (*EtcdHandler, error) {
Password: password, Password: password,
DialTimeout: 5 * time.Second, DialTimeout: 5 * time.Second,
}) })
fmt.Println(endpoints,prefix,username,password)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return nil, err return nil, err
} }
@ -93,7 +93,7 @@ func NewEtcdHandler(cfg *viper.Viper) (*EtcdHandler, error) {
func (s *EtcdHandler) Put(k string, v any) error { func (s *EtcdHandler) Put(k string, v any) error {
data, err := s.serializer.Serialize(v) data, err := s.serializer.Serialize(v)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
// _, err = s.Client.KV.Put(context.TODO(), k, data.String()) // _, err = s.Client.KV.Put(context.TODO(), k, data.String())
@ -101,7 +101,7 @@ func (s *EtcdHandler) Put(k string, v any) error {
_, err = s.Client.KV.Put(ctx, k, string(data)) _, err = s.Client.KV.Put(ctx, k, string(data))
cancel() cancel()
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
return nil return nil
@ -110,13 +110,13 @@ func (s *EtcdHandler) Put(k string, v any) error {
func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error { func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error {
lease, err := s.Client.Lease.Grant(context.TODO(), int64(duration.Seconds())) lease, err := s.Client.Lease.Grant(context.TODO(), int64(duration.Seconds()))
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
data, err := s.serializer.Serialize(v) data, err := s.serializer.Serialize(v)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
// _, err = s.Client.KV.Put(context.TODO(), k, data.String(), clientv3.WithLease(lease.ID)) // _, err = s.Client.KV.Put(context.TODO(), k, data.String(), clientv3.WithLease(lease.ID))
@ -125,7 +125,7 @@ func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error
cancel() cancel()
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
return nil return nil
@ -136,14 +136,14 @@ func (s *EtcdHandler) Get(k string) (any, error) {
resp, err := s.Client.KV.Get(ctx, k) resp, err := s.Client.KV.Get(ctx, k)
cancel() cancel()
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return nil, err return nil, err
} }
for _, v := range resp.Kvs { for _, v := range resp.Kvs {
var data any var data any
err := s.serializer.Deserialize([]byte(v.Value), &data) err := s.serializer.Deserialize([]byte(v.Value), &data)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return nil, err return nil, err
} }
// We return directly as we want to last revision of value // We return directly as we want to last revision of value
@ -157,7 +157,7 @@ func (s *EtcdHandler) Delete(k string) error {
_, err := s.Client.KV.Delete(ctx, k) _, err := s.Client.KV.Delete(ctx, k)
cancel() cancel()
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
return nil return nil

14
utils/storage/minio.go
View File

@ -2,12 +2,12 @@ package storage
import ( import (
"context" "context"
"fmt"
"io" "io"
"strings" "strings"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
"github.com/rs/zerolog/log"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -23,7 +23,7 @@ func NewMinioStorageHandler(cfg *viper.Viper) (*MinioStorageHandler, error) {
Secure: cfg.GetBool("storage.files.minio.use_ssl"), Secure: cfg.GetBool("storage.files.minio.use_ssl"),
}) })
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return nil, err return nil, err
} }
@ -53,13 +53,13 @@ func (s *MinioStorageHandler) List(prefix string) []FileInfo {
for object := range objectCh { for object := range objectCh {
if object.Err != nil { if object.Err != nil {
fmt.Println("Error : ", object.Err) log.Error().Str("prefix", prefix).Err(object.Err).Msg("Error listing files for prefix")
continue continue
} }
objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, object.Key, minio.StatObjectOptions{}) objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, object.Key, minio.StatObjectOptions{})
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
continue continue
} }
@ -82,12 +82,12 @@ func (s *MinioStorageHandler) List(prefix string) []FileInfo {
func (s *MinioStorageHandler) Get(prefix string, file string) (io.Reader, *FileInfo, error) { func (s *MinioStorageHandler) Get(prefix string, file string) (io.Reader, *FileInfo, error) {
object, err := s.Client.GetObject(context.Background(), s.BucketName, prefix+"/"+file, minio.GetObjectOptions{}) object, err := s.Client.GetObject(context.Background(), s.BucketName, prefix+"/"+file, minio.GetObjectOptions{})
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return nil, nil, err return nil, nil, err
} }
objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, prefix+"/"+file, minio.StatObjectOptions{}) objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, prefix+"/"+file, minio.StatObjectOptions{})
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return nil, nil, err return nil, nil, err
} }
@ -117,7 +117,7 @@ func (s *MinioStorageHandler) Copy(src string, dst string) error {
_, err := s.Client.CopyObject(context.Background(), dstOpts, srcOpts) _, err := s.Client.CopyObject(context.Background(), dstOpts, srcOpts)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
return nil return nil

11
utils/storage/sessions.go
View File

@ -11,6 +11,7 @@ import (
"github.com/gorilla/securecookie" "github.com/gorilla/securecookie"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/rs/zerolog/log"
) )
// Amount of time for cookies/kv keys to expire. // Amount of time for cookies/kv keys to expire.
@ -76,7 +77,7 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
// Marked for deletion. // Marked for deletion.
if session.Options.MaxAge <= 0 { if session.Options.MaxAge <= 0 {
if err := s.delete(r.Context(), session); err != nil { if err := s.delete(r.Context(), session); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
http.SetCookie(w, sessions.NewCookie(session.Name(), "", session.Options)) http.SetCookie(w, sessions.NewCookie(session.Name(), "", session.Options))
@ -87,13 +88,13 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
} }
if err := s.save(r.Context(), session); err != nil { if err := s.save(r.Context(), session); err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
encoded, err := securecookie.EncodeMulti(session.Name(), session.ID, s.Codecs...) encoded, err := securecookie.EncodeMulti(session.Name(), session.ID, s.Codecs...)
if err != nil { if err != nil {
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
http.SetCookie(w, sessions.NewCookie(session.Name(), encoded, session.Options)) http.SetCookie(w, sessions.NewCookie(session.Name(), encoded, session.Options))
@ -104,13 +105,11 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
// save stores the session in kv. // save stores the session in kv.
func (s *SessionStore) save(ctx context.Context, session *sessions.Session) error { func (s *SessionStore) save(ctx context.Context, session *sessions.Session) error {
m := make(map[string]interface{}, len(session.Values)) m := make(map[string]interface{}, len(session.Values))
fmt.Println(m)
for k, v := range session.Values { for k, v := range session.Values {
fmt.Println(v)
ks, ok := k.(string) ks, ok := k.(string)
if !ok { if !ok {
err := fmt.Errorf("non-string key value, cannot serialize session: %v", k) err := fmt.Errorf("non-string key value, cannot serialize session: %v", k)
fmt.Println(err) log.Error().Err(err).Msg("")
return err return err
} }
m[ks] = v m[ks] = v