Misc final tweaks

- Handle notes being nil
- Distinguish between request not found, error retrieving notes, and no notes for present request
- Minor UI tweaks to use smart quotes
This commit was merged in pull request #14.
This commit is contained in:
Daniel J. Summers
2018-05-27 19:26:52 -05:00
parent d57e2e863a
commit 91daa387cb
6 changed files with 39 additions and 17 deletions

View File

@@ -232,7 +232,11 @@ func FullByID(userID, reqID string) (*JournalRequest, bool) {
log.Print(hRows.Err())
return nil, false
}
req.Notes = NotesByID(userID, reqID)
req.Notes, err = NotesByID(userID, reqID)
if err != nil {
log.Print(err)
return nil, false
}
return req, true
}
@@ -248,9 +252,9 @@ func Journal(userID string) []JournalRequest {
}
// NotesByID retrieves the notes for a given prayer request
func NotesByID(userID, reqID string) []Note {
func NotesByID(userID, reqID string) ([]Note, error) {
if _, ok := retrieveRequest(reqID, userID); !ok {
return nil
return nil, sql.ErrNoRows
}
rows, err := db.Query(`
SELECT "asOf", "notes"
@@ -260,7 +264,7 @@ func NotesByID(userID, reqID string) []Note {
reqID)
if err != nil {
log.Print(err)
return nil
return nil, err
}
defer rows.Close()
var notes []Note
@@ -275,9 +279,9 @@ func NotesByID(userID, reqID string) []Note {
}
if rows.Err() != nil {
log.Print(rows.Err())
return nil
return nil, err
}
return notes
return notes, nil
}
/* DDL */