Fix delete behaviour

internal/notes/notes.go

@@ -5,13 +5,16 @@ package notes
 import (
 	"bufio"
 	"bytes"
+	"cmp"
 	"crypto/rand"
 	"errors"
 	"fmt"
 	"html/template"
 	"log"
+	"maps"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 
@@ -98,14 +101,26 @@ func Init() error {
 	return nil
 }
 
+func (ns *noteSet) Sort() []*Note {
+	orderByTitle := func(a, b *Note) int {
+		return cmp.Compare(a.Title, b.Title)
+	}
+	return slices.SortedFunc(maps.Keys(*ns), orderByTitle)
+}
+
 func (ns *NoteStore) Get(owner string) noteSet {
 	return ns.notes[owner]
 }
 
+func (ns *NoteStore) GetOrdered(owner string) []*Note {
+	notes := ns.Get(owner)
+	return notes.Sort()
+}
+
 func (ns *NoteStore) GetOne(owner string, uid string) (*Note, bool) {
 	notes := ns.Get(owner)
 
-	for note, _ := range notes {
+	for note := range notes {
 		if note.Uid == uid {
 			log.Printf("Found single note during GetOne %s", note.Title)
 			return note, true
@@ -121,8 +136,9 @@ func (ns *NoteStore) Add(note *Note, user string) {
 	ns.notes[user][note] = true
 }
 
-func (ns *NoteStore) Del(note *Note, user string) {
+func (ns *NoteStore) Del(note *Note, user string) error {
 	delete(ns.notes[user], note)
+	return note.Delete()
 }
 
 func (ns *NoteStore) UserTags(user string) []string {
@@ -145,13 +161,7 @@ func (ns *NoteStore) UserTags(user string) []string {
 
 	log.Printf("Tagset is %v", tagSet)
 
-	tags := make([]string, len(tagSet))
-	i := 0
-	for tag := range tagSet {
-		tags[i] = tag
-		i++
-	}
-	return tags
+	return slices.Sorted(maps.Keys(tagSet))
 }
 
 func fmtPath(path string) string {
@@ -331,8 +341,8 @@ func (n *Note) DelViewer(viewer string) {
 	delete(n.Viewers, viewer)
 }
 
-func DeleteNote(uid string) error {
-	filename := filepath.Join(conf.Conf.NotesDir, fmtPath(uid))
+func (n *Note) Delete() error {
+	filename := filepath.Join(conf.Conf.NotesDir, fmtPath(n.Uid))
 	return os.Remove(filename)
 }
 
@@ -408,10 +418,5 @@ func (n *Note) ToggleBox(nthBox int) (bool, bool) {
 }
 
 func (n *Note) HasTag(tag string) bool {
-	for _, tag_ := range n.Tags {
-		if tag_ == tag {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(n.Tags, tag)
 }

internal/notes/views/views.go

@@ -107,10 +107,18 @@ func new(w http.ResponseWriter, r *http.Request) {
 }
 
 func delete(w http.ResponseWriter, r *http.Request) {
-	// user := r.Context().Value(middleware.ContextKey("user")).(string)
+	user := r.Context().Value(middleware.ContextKey("user")).(string)
+
+	uid := r.PathValue("note")
+
+	note, ok := notes.Notes.GetOne(user, uid)
+
+	if !ok {
+		http.NotFound(w, r)
+	}
+
+	err := notes.Notes.Del(note, user)
 
-	encodedTitle := r.PathValue("note")
-	err := notes.DeleteNote(encodedTitle)
 	if err != nil {
 		log.Print(err.Error())
 		http.Error(w, "Couldn't delete note", http.StatusInternalServerError)
@@ -215,11 +223,11 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	titlesAndUrls := make([]titleAndURL, 0)
 
-	ns := notes.Notes.Get(user)
+	ns := notes.Notes.GetOrdered(user)
 	log.Printf("Notes: %+v", notes.Notes)
 	log.Printf("Notes for %s: %+v", user, ns)
 
-	for note := range ns {
+	for _, note := range ns {
 		if tag == "" || note.HasTag(tag) {
 			titlesAndUrls = append(
 				titlesAndUrls,