Yimaru/Yimaru-BackEnd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Yimaru:1f77b93ec7862dc4bc092ef18cc19fd7c3edabf1
Branches Tags
Yimaru:main
Yimaru:production
..
compare: Yimaru:800d2a4b3ac42d19e6148d62d799fbcebc976bdf
Branches Tags
Yimaru:main
Yimaru:production

No commits in common. "1f77b93ec7862dc4bc092ef18cc19fd7c3edabf1" and "800d2a4b3ac42d19e6148d62d799fbcebc976bdf" have entirely different histories.
1f77b93ec7 ... 800d2a4b3a

1 changed files with 2 additions and 12 deletions
Show Stats Expand all files Collapse all files

14
internal/repository/notification.go
View File

@ -231,15 +231,6 @@ func mapDBToDomain(db *dbgen.Notification) *domain.Notification {
payload = domain.NotificationPayload{} payload = domain.NotificationPayload{}
} }
headline := payload.Headline
if headline == "" {
headline = db.Title
}
message := payload.Message
if message == "" {
message = db.Message
}
var channel domain.DeliveryChannel var channel domain.DeliveryChannel
if db.Channel.Valid { if db.Channel.Valid {
channel = domain.DeliveryChannel(db.Channel.String) channel = domain.DeliveryChannel(db.Channel.String)
@ -254,9 +245,8 @@ func mapDBToDomain(db *dbgen.Notification) *domain.Notification {
DeliveryChannel: channel, DeliveryChannel: channel,
DeliveryStatus: domain.DeliveryStatusPending, DeliveryStatus: domain.DeliveryStatusPending,
Payload: domain.NotificationPayload{ Payload: domain.NotificationPayload{
Headline: headline, Headline: payload.Headline,
Message: message, Message: payload.Message,
Tags: payload.Tags,
}, },
IsRead: db.IsRead, IsRead: db.IsRead,
Timestamp: db.CreatedAt.Time, Timestamp: db.CreatedAt.Time,