SynLotto/website
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects 5 Releases Wiki Activity

Still working through messages and notifications.

Browse Source
This commit is contained in:
Ross Healy
2025-10-30 17:22:52 +00:00
parent 8650b1fd63
commit 262536135d
18 changed files with 154 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/platform/services/messages/service.go
View File

@@ -37,14 +37,15 @@ func New(db *sql.DB, opts ...func(*Service)) *Service {
// Ensure *Service satisfies the domain interface.
var _ domain.MessageService = (*Service)(nil)
// ToDo: Needs a userId on table or rename the recipiant id.. but then again dont want to expose userids to users for sending.
func (s *Service) ListInbox(userID int64) ([]domain.Message, error) {
ctx, cancel := context.WithTimeout(context.Background(), s.Timeout)
defer cancel()
q := `
SELECT id, from_email, to_email, subject, body, is_read, is_archived, created_at
SELECT id, senderId, recipientId, subject, message, is_read, is_archived, created_at
FROM users_messages
WHERE user_id = ? AND is_archived = FALSE
WHERE recipientId = ? AND is_archived = FALSE
ORDER BY created_at DESC`
q = s.bind(q)
@@ -57,7 +58,7 @@ func (s *Service) ListInbox(userID int64) ([]domain.Message, error) {
var out []domain.Message
for rows.Next() {
var m domain.Message
if err := rows.Scan(&m.ID, &m.From, &m.To, &m.Subject, &m.Body, &m.IsRead, &m.IsArchived, &m.CreatedAt); err != nil {
if err := rows.Scan(&m.ID, &m.SenderId, &m.RecipientId, &m.Subject, &m.Body, &m.IsRead, &m.IsArchived, &m.CreatedAt); err != nil {
return nil, err
}
out = append(out, m)
@@ -71,9 +72,9 @@ func (s *Service) ListArchived(userID int64) ([]domain.Message, error) {
defer cancel()
q := `
SELECT id, from_email, to_email, subject, body, is_read, is_archived, created_at
SELECT id, senderId, recipientId, subject, message, is_read, is_archived, created_at
FROM users_messages
WHERE user_id = ? AND is_archived = TRUE
WHERE recipientId = ? AND is_archived = TRUE
ORDER BY created_at DESC`
q = s.bind(q)
@@ -86,7 +87,7 @@ func (s *Service) ListArchived(userID int64) ([]domain.Message, error) {
var out []domain.Message
for rows.Next() {
var m domain.Message
if err := rows.Scan(&m.ID, &m.From, &m.To, &m.Subject, &m.Body, &m.IsRead, &m.IsArchived, &m.CreatedAt); err != nil {
if err := rows.Scan(&m.ID, &m.SenderId, &m.RecipientId, &m.Subject, &m.Body, &m.IsRead, &m.IsArchived, &m.CreatedAt); err != nil {
return nil, err
}
out = append(out, m)
@@ -99,14 +100,14 @@ func (s *Service) GetByID(userID, id int64) (*domain.Message, error) {
defer cancel()
q := `
SELECT id, from_email, to_email, subject, body, is_read, is_archived, created_at
SELECT id, senderId, recipientId, subject, message, is_read, is_archived, created_at
FROM users_messages
WHERE user_id = ? AND id = ?`
WHERE recipientId = ? AND id = ?`
q = s.bind(q)
var m domain.Message
err := s.DB.QueryRowContext(ctx, q, userID, id).
Scan(&m.ID, &m.From, &m.To, &m.Subject, &m.Body, &m.IsRead, &m.IsArchived, &m.CreatedAt)
Scan(&m.ID, &m.SenderId, &m.RecipientId, &m.Subject, &m.Body, &m.IsRead, &m.IsArchived, &m.CreatedAt)
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
@@ -123,19 +124,19 @@ func (s *Service) Create(userID int64, in domain.CreateMessageInput) (int64, err
switch s.Dialect {
case "postgres":
const q = `
INSERT INTO messages (user_id, from_email, to_email, subject, body, is_read, is_archived, created_at)
INSERT INTO messages (id, senderId, recipientId, subject, message, is_read, is_archived, created_at)
VALUES ($1, $2, $3, $4, $5, FALSE, FALSE, NOW())
RETURNING id`
var id int64
if err := s.DB.QueryRowContext(ctx, q, userID, "", in.To, in.Subject, in.Body).Scan(&id); err != nil {
if err := s.DB.QueryRowContext(ctx, q, userID, "", in.RecipientID, in.Subject, in.Body).Scan(&id); err != nil {
return 0, err
}
return id, nil
default: // mysql/sqlite
const q = `
INSERT INTO messages (user_id, from_email, to_email, subject, body, is_read, is_archived, created_at)
INSERT INTO messages (id, senderId, recipientId, subject, message is_read, is_archived, created_at)
VALUES (?, ?, ?, ?, ?, FALSE, FALSE, CURRENT_TIMESTAMP)`
res, err := s.DB.ExecContext(ctx, q, userID, "", in.To, in.Subject, in.Body)
res, err := s.DB.ExecContext(ctx, q, userID, "", in.RecipientID, in.Subject, in.Body)
if err != nil {
return 0, err
}

4
internal/platform/services/notifications/service.go
View File

@@ -42,7 +42,7 @@ func (s *Service) List(userID int64) ([]domain.Notification, error) {
const q = `
SELECT id, title, body, is_read, created_at
FROM notifications
WHERE user_id = ?
WHERE userId = ?
ORDER BY created_at DESC`
rows, err := s.DB.QueryContext(ctx, q, userID)
@@ -69,7 +69,7 @@ func (s *Service) GetByID(userID, id int64) (*domain.Notification, error) {
const q = `
SELECT id, title, body, is_read, created_at
FROM notifications
WHERE user_id = ? AND id = ?`
WHERE userId = ? AND id = ?`
var n domain.Notification
err := s.DB.QueryRowContext(ctx, q, userID, id).