mirror of
https://github.com/simon987/task_tracker.git
synced 2025-12-10 21:48:52 +00:00
some bug fixes, some optimizations
This commit is contained in:
13
api/log.go
13
api/log.go
@@ -30,6 +30,11 @@ type GetLogResponse struct {
|
||||
Logs *[]storage.LogEntry `json:"logs"`
|
||||
}
|
||||
|
||||
type LogResponse struct {
|
||||
Ok bool `json:"ok"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
func (e *LogRequest) Time() time.Time {
|
||||
|
||||
t := time.Unix(e.TimeStamp, 0)
|
||||
@@ -89,7 +94,7 @@ func (api *WebAPI) LogTrace(r *Request) {
|
||||
|
||||
entry, err := api.parseLogEntry(r)
|
||||
if err != nil {
|
||||
r.Json(GetLogResponse{
|
||||
r.Json(LogResponse{
|
||||
Ok: false,
|
||||
Message: "Could not parse request",
|
||||
}, 400)
|
||||
@@ -106,7 +111,7 @@ func (api *WebAPI) LogInfo(r *Request) {
|
||||
|
||||
entry, err := api.parseLogEntry(r)
|
||||
if err != nil {
|
||||
r.Json(GetLogResponse{
|
||||
r.Json(LogResponse{
|
||||
Ok: false,
|
||||
Message: "Could not parse request",
|
||||
}, 400)
|
||||
@@ -123,7 +128,7 @@ func (api *WebAPI) LogWarn(r *Request) {
|
||||
|
||||
entry, err := api.parseLogEntry(r)
|
||||
if err != nil {
|
||||
r.Json(GetLogResponse{
|
||||
r.Json(LogResponse{
|
||||
Ok: false,
|
||||
Message: "Could not parse request",
|
||||
}, 400)
|
||||
@@ -140,7 +145,7 @@ func (api *WebAPI) LogError(r *Request) {
|
||||
|
||||
entry, err := api.parseLogEntry(r)
|
||||
if err != nil {
|
||||
r.Json(GetLogResponse{
|
||||
r.Json(LogResponse{
|
||||
Ok: false,
|
||||
Message: "Could not parse request",
|
||||
}, 400)
|
||||
|
||||
@@ -202,7 +202,15 @@ func (api *WebAPI) ProjectGet(r *Request) {
|
||||
|
||||
func (api *WebAPI) ProjectGetAllProjects(r *Request) {
|
||||
|
||||
projects := api.Database.GetAllProjects()
|
||||
worker, _ := api.validateSignature(r)
|
||||
|
||||
var id int64
|
||||
if worker == nil {
|
||||
id = 0
|
||||
} else {
|
||||
id = worker.Id
|
||||
}
|
||||
projects := api.Database.GetAllProjects(id)
|
||||
|
||||
r.OkJson(GetAllProjectsResponse{
|
||||
Ok: true,
|
||||
|
||||
17
api/task.go
17
api/task.go
@@ -156,11 +156,20 @@ func (api *WebAPI) TaskGet(r *Request) {
|
||||
}
|
||||
|
||||
task := api.Database.GetTask(worker)
|
||||
if task == nil {
|
||||
|
||||
r.OkJson(GetTaskResponse{
|
||||
Ok: true,
|
||||
Task: task,
|
||||
})
|
||||
r.OkJson(GetTaskResponse{
|
||||
Ok: false,
|
||||
Message: "No task available",
|
||||
})
|
||||
|
||||
} else {
|
||||
|
||||
r.OkJson(GetTaskResponse{
|
||||
Ok: true,
|
||||
Task: task,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func (api WebAPI) validateSignature(r *Request) (*storage.Worker, error) {
|
||||
|
||||
Reference in New Issue
Block a user