Merge branch 'main' into chore/refactor

This commit is contained in:
André Medeiros 2021-08-14 11:24:36 -04:00 committed by GitHub
commit 37f2e2aedd
2 changed files with 66 additions and 0 deletions

1
go.mod
View file

@ -10,6 +10,7 @@ require (
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/dustin/go-humanize v1.0.0 github.com/dustin/go-humanize v1.0.0
github.com/go-co-op/gocron v1.6.2 github.com/go-co-op/gocron v1.6.2
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-redis/redis/v8 v8.11.0 github.com/go-redis/redis/v8 v8.11.0
github.com/gorilla/mux v1.8.0 github.com/gorilla/mux v1.8.0
github.com/heroku/x v0.0.31 github.com/heroku/x v0.0.31

View file

@ -108,3 +108,68 @@ func (a *api) deleteDeviceHandler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
} }
func (a *api) testDeviceHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
ctx := context.Background()
tok := ps.ByName("apns")
d, err := a.models.Devices.GetByAPNSToken(tok)
if err != nil {
a.logger.WithFields(logrus.Fields{
"err": err,
}).Info("failed fetching device from database")
a.errorResponse(w, r, 500, err.Error())
return
}
stmt := `
SELECT username
FROM accounts
INNER JOIN devices_accounts ON devices_accounts.account_id = accounts.id
WHERE devices_accounts.device_id = $1`
rows, err := a.db.Query(ctx, stmt, d.ID)
if err != nil {
a.logger.WithFields(logrus.Fields{
"apns": tok,
"err": err,
}).Error("failed to fetch device accounts")
return
}
defer rows.Close()
var users []string
for rows.Next() {
var user string
rows.Scan(&user)
users = append(users, user)
}
body := fmt.Sprintf("Active usernames are: %s. Tap me for more info!", english.OxfordWordSeries(users, "and"))
notification := &apns2.Notification{}
notification.Topic = "com.christianselig.Apollo"
notification.DeviceToken = d.APNSToken
notification.Payload = payload.
NewPayload().
Category("test-notification").
Custom("test_accounts", strings.Join(users, ",")).
AlertTitle(notificationTitle).
AlertBody(body)
client := apns2.NewTokenClient(a.apns)
if !d.Sandbox {
client = client.Production()
}
if _, err := client.Push(notification); err != nil {
a.logger.WithFields(logrus.Fields{
"err": err,
}).Info("failed to send test notification")
a.errorResponse(w, r, 500, err.Error())
return
}
w.WriteHeader(http.StatusOK)
}
func (a *api) deleteDeviceHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
w.WriteHeader(http.StatusOK)
}