feed/folder list endpoints

storage/feed.go

@@ -1,22 +1,22 @@
 package storage
 
 type Feed struct {
-	Id int64
-	FolderId int64
-	Title string
-	Description string
-	Link string
-	FeedLink string
-	Icon string
+	Id int64 `json:"id"`
+	FolderId *int64 `json:"folder_id"`
+	Title string `json:"title"`
+	Description string `json:"description"`
+	Link string `json:"link"`
+	FeedLink string `json:"feed_link"`
+	Icon string	`json:"icon"`
 }
 
-func (s *Storage) CreateFeed(title, description, link, feedLink, icon string, folderId int64) *Feed {
+func (s *Storage) CreateFeed(title, description, link, feedLink, icon string, folderId *int64) *Feed {
 	result, err := s.db.Exec(`
 		insert into feeds (title, description, link, feed_link, icon, folder_id) 
 		values (?, ?, ?, ?, ?, ?)
 		on conflict (feed_link) do update set folder_id=?`,
-		title, description, link, feedLink, icon, intOrNil(folderId),
-		intOrNil(folderId),
+		title, description, link, feedLink, icon, folderId,
+		folderId,
 	)
 	if err != nil {
 		return nil

storage/folder.go

@@ -5,9 +5,9 @@ import (
 )
 
 type Folder struct {
-	Id int64
-	Title string
-	IsExpanded bool
+	Id int64 `json:"id"`
+	Title string `json:"title"`
+	IsExpanded bool `json:"is_expanded"`
 }
 
 func (s *Storage) CreateFolder(title string) *Folder {

storage/storage.go

@@ -11,7 +11,7 @@ var initQuery string = `
 create table if not exists folders (
  id             integer primary key autoincrement,
  title          text not null,
- is_expanded    boolean
+ is_expanded    boolean not null default false
 );
 
 create table if not exists feeds (