minor fixes

Author: tib

Chapter 12/myProject/Sources/App/Modules/Api/Controllers/ApiListController.swift

@@ -18,7 +18,7 @@ protocol ApiListController: ListController {
 extension ApiListController {
 
     func listApi(_ req: Request) async throws -> [ListObject] {
-        let models = try await DatabaseModel.query(on: req.db).all()
+        let models = try await list(req)
         return try await listOutput(req, models)
     }
 

Chapter 12/myProject/Sources/App/Modules/Blog/Controllers/BlogCategoryApiController.swift

@@ -14,23 +14,23 @@ struct BlogCategoryApiController: ApiController {
     typealias ApiModel = Blog.Category
     typealias DatabaseModel = BlogCategoryModel
 
-    func listOutput(_ req: Request, _ models: [BlogCategoryModel]) async throws -> [Blog.Category.List] {
+    func listOutput(_ req: Request, _ models: [DatabaseModel]) async throws -> [Blog.Category.List] {
         models.map { .init(id: $0.id!, title: $0.title) }
     }
 
-    func detailOutput(_ req: Request, _ model: BlogCategoryModel) async throws -> Blog.Category.Detail {
+    func detailOutput(_ req: Request, _ model: DatabaseModel) async throws -> Blog.Category.Detail {
         .init(id: model.id!, title: model.title)
     }
 
-    func createInput(_ req: Request, _ model: BlogCategoryModel, _ input: Blog.Category.Create) async throws {
+    func createInput(_ req: Request, _ model: DatabaseModel, _ input: Blog.Category.Create) async throws {
         model.title = input.title
     }
 
-    func updateInput(_ req: Request, _ model: BlogCategoryModel, _ input: Blog.Category.Update) async throws {
+    func updateInput(_ req: Request, _ model: DatabaseModel, _ input: Blog.Category.Update) async throws {
         model.title = input.title
     }
 
-    func patchInput(_ req: Request, _ model: BlogCategoryModel, _ input: Blog.Category.Patch) async throws {
+    func patchInput(_ req: Request, _ model: DatabaseModel, _ input: Blog.Category.Patch) async throws {
         model.title = input.title ?? model.title
     }
 }

Chapter 12/myProject/Sources/App/Modules/Blog/Controllers/BlogPostApiController.swift

@@ -14,7 +14,7 @@ struct BlogPostApiController: ApiController {
     typealias ApiModel = Blog.Post
     typealias DatabaseModel = BlogPostModel
 
-    func listOutput(_ req: Request, _ models: [BlogPostModel]) async throws -> [Blog.Post.List] {
+    func listOutput(_ req: Request, _ models: [DatabaseModel]) async throws -> [Blog.Post.List] {
         models.map { model in
             .init(id: model.id!,
                   title: model.title,
@@ -25,7 +25,7 @@ struct BlogPostApiController: ApiController {
         }
     }
 
-    func detailOutput(_ req: Request, _ model: BlogPostModel) async throws -> Blog.Post.Detail {
+    func detailOutput(_ req: Request, _ model: DatabaseModel) async throws -> Blog.Post.Detail {
         .init(id: model.id!,
               title: model.title,
               slug: model.slug,
@@ -37,15 +37,15 @@ struct BlogPostApiController: ApiController {
               content: model.content)
     }
 
-    func createInput(_ req: Request, _ model: BlogPostModel, _ input: Blog.Post.Create) async throws {
+    func createInput(_ req: Request, _ model: DatabaseModel, _ input: Blog.Post.Create) async throws {
         model.title = input.title
     }
 
-    func updateInput(_ req: Request, _ model: BlogPostModel, _ input: Blog.Post.Update) async throws {
+    func updateInput(_ req: Request, _ model: DatabaseModel, _ input: Blog.Post.Update) async throws {
         model.title = input.title
     }
 
-    func patchInput(_ req: Request, _ model: BlogPostModel, _ input: Blog.Post.Patch) async throws {
+    func patchInput(_ req: Request, _ model: DatabaseModel, _ input: Blog.Post.Patch) async throws {
         model.title = input.title ?? model.title
     }
 }