tsk-6: Check queue (#12)
Closes #6 Reviewed-on: #12 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package auth
|
||||
package service
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
@@ -20,7 +20,7 @@ type service struct {
|
||||
Passphrase string `json:"passphrase"`
|
||||
}
|
||||
|
||||
type response struct {
|
||||
type tokenResponse struct {
|
||||
Message string `json:"message"`
|
||||
Data []*token.Login `json:"data"`
|
||||
}
|
||||
@@ -45,7 +45,7 @@ func (a *Auth) GetToken() (*token.Login, error) {
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var r response
|
||||
var r tokenResponse
|
||||
err = json.NewDecoder(resp.Body).Decode(&r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -1,4 +1,4 @@
|
||||
package config
|
||||
package core
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/token"
|
||||
|
||||
"git.kundeng.us/phoenix/catapult/internal/app"
|
||||
"git.kundeng.us/phoenix/catapult/internal/auth"
|
||||
"git.kundeng.us/phoenix/catapult/internal/service"
|
||||
)
|
||||
|
||||
type Service struct {
|
||||
@@ -55,7 +55,7 @@ func (s *Service) worker1() {
|
||||
// Do some work
|
||||
log.Println("Worker 1: Processing...")
|
||||
if s.token == nil {
|
||||
catapultAuth := auth.Auth{Application: s.App}
|
||||
catapultAuth := service.Auth{Application: s.App}
|
||||
if token, err := catapultAuth.GetToken(); err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
} else {
|
||||
@@ -63,6 +63,17 @@ func (s *Service) worker1() {
|
||||
s.token = token
|
||||
}
|
||||
}
|
||||
|
||||
queue := service.Queue{Application: s.App, Token: s.token}
|
||||
if item, exists, err := queue.GetQueue(); err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
} else {
|
||||
if *exists {
|
||||
fmt.Println("Id:", item.Id)
|
||||
} else {
|
||||
fmt.Println("Empty queue")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling"
|
||||
"git.kundeng.us/phoenix/textsender-models/tx0/token"
|
||||
|
||||
"git.kundeng.us/phoenix/catapult/internal/app"
|
||||
)
|
||||
|
||||
type Queue struct {
|
||||
Application *app.App
|
||||
Token *token.Login
|
||||
}
|
||||
|
||||
type queueResponse struct {
|
||||
Message string `json:"message"`
|
||||
Data []*scheduling.ScheduledMessage `json:"data"`
|
||||
}
|
||||
|
||||
func (q *Queue) GetQueue() (*scheduling.ScheduledMessage, *bool, error) {
|
||||
req, err := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/schedule/message/fetch", q.Application.ApiUrl), nil)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
token := q.Token.AccessToken
|
||||
req.Header.Set("Authorization", "Bearer "+token)
|
||||
|
||||
client := &http.Client{}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var r queueResponse
|
||||
err = json.NewDecoder(resp.Body).Decode(&r)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
} else {
|
||||
var exists bool
|
||||
if len(r.Data) == 0 {
|
||||
exists = false
|
||||
return nil, &exists, nil
|
||||
} else {
|
||||
exists = true
|
||||
return r.Data[0], &exists, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user