Refactor data handlers + misc fixes

This refactors the data handlers into a more standard/understood model-like architecture, to prepare for a new, more robust config system.

It also fixes a problem with creating new Notes and uploading new Photos via the web interface (related to #58).

Finally, it speeds up docker builds by sending in less files, which aren't necessary or will be built anyway.

This is all in preparation to allow building #13 more robustly.

routes/api/news/add-feed.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState, NewsFeed } from '/lib/types.ts';
-import { createNewsFeed, getNewsFeeds } from '/lib/data/news.ts';
+import { FeedModel } from '/lib/models/news.ts';
 import { fetchNewArticles } from '/crons/news.ts';
 
 interface Data {}
@@ -24,7 +24,7 @@ export const handler: Handlers<Data, FreshContextState> = {
     const requestBody = await request.clone().json() as RequestBody;
 
     if (requestBody.feedUrl) {
-      const newFeed = await createNewsFeed(context.state.user.id, requestBody.feedUrl);
+      const newFeed = await FeedModel.create(context.state.user.id, requestBody.feedUrl);
 
       if (!newFeed) {
         return new Response('Not found', { status: 404 });
@@ -33,7 +33,7 @@ export const handler: Handlers<Data, FreshContextState> = {
 
     await fetchNewArticles();
 
-    const newFeeds = await getNewsFeeds(context.state.user.id);
+    const newFeeds = await FeedModel.list(context.state.user.id);
 
     const responseBody: ResponseBody = { success: true, newFeeds };
 

routes/api/news/delete-feed.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState, NewsFeed } from '/lib/types.ts';
-import { deleteNewsFeed, getNewsFeed, getNewsFeeds } from '/lib/data/news.ts';
+import { FeedModel } from '/lib/models/news.ts';
 
 interface Data {}
 
@@ -23,16 +23,16 @@ export const handler: Handlers<Data, FreshContextState> = {
     const requestBody = await request.clone().json() as RequestBody;
 
     if (requestBody.feedId) {
-      const newsFeed = await getNewsFeed(requestBody.feedId, context.state.user.id);
+      const newsFeed = await FeedModel.get(requestBody.feedId, context.state.user.id);
 
       if (!newsFeed) {
         return new Response('Not found', { status: 404 });
       }
 
-      await deleteNewsFeed(requestBody.feedId, context.state.user.id);
+      await FeedModel.delete(requestBody.feedId, context.state.user.id);
     }
 
-    const newFeeds = await getNewsFeeds(context.state.user.id);
+    const newFeeds = await FeedModel.list(context.state.user.id);
 
     const responseBody: ResponseBody = { success: true, newFeeds };
 

routes/api/news/import-feeds.tsx

@@ -2,7 +2,7 @@ import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState, NewsFeed } from '/lib/types.ts';
 import { concurrentPromises } from '/lib/utils/misc.ts';
-import { createNewsFeed, getNewsFeeds } from '/lib/data/news.ts';
+import { FeedModel } from '/lib/models/news.ts';
 import { fetchNewArticles } from '/crons/news.ts';
 
 interface Data {}
@@ -30,14 +30,14 @@ export const handler: Handlers<Data, FreshContextState> = {
       }
 
       await concurrentPromises(
-        requestBody.feedUrls.map((feedUrl) => () => createNewsFeed(context.state.user!.id, feedUrl)),
+        requestBody.feedUrls.map((feedUrl) => () => FeedModel.create(context.state.user!.id, feedUrl)),
         5,
       );
     }
 
     await fetchNewArticles();
 
-    const newFeeds = await getNewsFeeds(context.state.user.id);
+    const newFeeds = await FeedModel.list(context.state.user.id);
 
     const responseBody: ResponseBody = { success: true, newFeeds };
 

routes/api/news/mark-read.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState } from '/lib/types.ts';
-import { getNewsArticle, markAllArticlesRead, updateNewsArticle } from '/lib/data/news.ts';
+import { ArticleModel } from '/lib/models/news.ts';
 
 interface Data {}
 
@@ -23,9 +23,9 @@ export const handler: Handlers<Data, FreshContextState> = {
 
     if (requestBody.articleId) {
       if (requestBody.articleId === 'all') {
-        await markAllArticlesRead(context.state.user.id);
+        await ArticleModel.markAllRead(context.state.user.id);
       } else {
-        const article = await getNewsArticle(requestBody.articleId, context.state.user.id);
+        const article = await ArticleModel.get(requestBody.articleId, context.state.user.id);
 
         if (!article) {
           return new Response('Not found', { status: 404 });
@@ -33,7 +33,7 @@ export const handler: Handlers<Data, FreshContextState> = {
 
         article.is_read = true;
 
-        await updateNewsArticle(article);
+        await ArticleModel.update(article);
       }
     }
 

routes/api/news/refresh-articles.tsx

@@ -1,7 +1,7 @@
 import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState, NewsFeedArticle } from '/lib/types.ts';
-import { getNewsArticles, getNewsFeeds } from '/lib/data/news.ts';
+import { ArticleModel, FeedModel } from '/lib/models/news.ts';
 import { fetchNewArticles } from '/crons/news.ts';
 
 interface Data {}
@@ -19,7 +19,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       return new Response('Unauthorized', { status: 401 });
     }
 
-    const newsFeeds = await getNewsFeeds(context.state.user.id);
+    const newsFeeds = await FeedModel.list(context.state.user.id);
 
     if (!newsFeeds.length) {
       return new Response('Not found', { status: 404 });
@@ -27,7 +27,7 @@ export const handler: Handlers<Data, FreshContextState> = {
 
     await fetchNewArticles(true);
 
-    const newArticles = await getNewsArticles(context.state.user.id);
+    const newArticles = await ArticleModel.list(context.state.user.id);
 
     const responseBody: ResponseBody = { success: true, newArticles };