Parent and Children now have default routes

twof · Oct 1, 2018 · 3d1b0ff · 3d1b0ff
1 parent 4adb1d2
commit 3d1b0ff
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/Sources/CrudRouter/CrudChildrenController.swift b/Sources/CrudRouter/CrudChildrenController.swift
@@ -90,7 +90,7 @@ public extension CrudChildrenControllerProtocol {
                     .unwrap(or: Abort(.notFound))
                     .delete(on: req)
                     .transform(to: HTTPStatus.ok)
-            }
+        }
     }
 }
 
@@ -111,6 +111,11 @@ public struct CrudChildrenController<ChildT: Model & Content, ParentT: Model & C
     let path: [PathComponentsRepresentable]
 
     public init(childrenRelation: KeyPath<ParentT, Children<ParentT, ChildT>>, basePath: [PathComponentsRepresentable], path: [PathComponentsRepresentable]) {
+        let path
+            = path.count == 0
+                ? [String(describing: ChildType.self).snakeCased()! as PathComponentsRepresentable]
+                : path
+
         self.children = childrenRelation
         self.basePath = basePath
         self.path = path

diff --git a/Sources/CrudRouter/CrudController.swift b/Sources/CrudRouter/CrudController.swift
@@ -77,7 +77,7 @@ public struct CrudController<ModelT: Model & Content>: CrudControllerProtocol wh
     public func crudRouterCollection<ParentType>(
         at path: PathComponentsRepresentable...,
         forParent relation: KeyPath<ModelType, Parent<ModelType, ParentType>>
-    ) -> CrudParentController<ModelType, ParentType> where
+        ) -> CrudParentController<ModelType, ParentType> where
         ParentType: Model & Content,
         ModelType.Database == ParentType.Database,
         ParentType.ID: Parameter {
@@ -89,7 +89,7 @@ public struct CrudController<ModelT: Model & Content>: CrudControllerProtocol wh
     public func crudRouterCollection<ChildType>(
         at path: PathComponentsRepresentable...,
         forChildren relation: KeyPath<ModelType, Children<ModelType, ChildType>>
-    ) -> CrudChildrenController<ChildType, ModelType> where
+        ) -> CrudChildrenController<ChildType, ModelType> where
         ChildType: Model & Content,
         ModelType.Database == ChildType.Database,
         ChildType.ID: Parameter {
@@ -102,7 +102,7 @@ public struct CrudController<ModelT: Model & Content>: CrudControllerProtocol wh
         at path: PathComponentsRepresentable...,
         forParent relation: KeyPath<ModelType, Parent<ModelType, ParentType>>,
         relationConfiguration: ((CrudParentController<ModelType, ParentType>) throws -> Void)?=nil
-    ) throws where
+        ) throws where
         ParentType: Model & Content,
         ModelType.Database == ParentType.Database,
         ParentType.ID: Parameter {
@@ -117,7 +117,7 @@ public struct CrudController<ModelT: Model & Content>: CrudControllerProtocol wh
         at path: PathComponentsRepresentable...,
         forChildren relation: KeyPath<ModelType, Children<ModelType, ChildType>>,
         relationConfiguration: ((CrudChildrenController<ChildType, ModelType>) throws -> Void)?=nil
-    ) throws where
+        ) throws where
         ChildType: Model & Content,
         ModelType.Database == ChildType.Database,
         ChildType.ID: Parameter {
@@ -128,20 +128,20 @@ public struct CrudController<ModelT: Model & Content>: CrudControllerProtocol wh
             try controller.boot(router: self.router)
     }
 
-//    public func crudRouterCollection<ChildType, ThroughType>(
-//        forSiblings relation: KeyPath<ModelType, Siblings<ModelType, ChildType, ThroughType>>,
-//        at path: [PathComponentsRepresentable]
-//    ) -> CrudSiblingsController<ChildType, ModelType, ThroughType> where
-//        ChildType: Content,
-//        ModelType.Database == ThroughType.Database,
-//        ChildType.ID: Parameter,
-//        ThroughType: ModifiablePivot,
-//        ThroughType.Database: JoinSupporting,
-//        ThroughType.Database == ChildType.Database {
-//            let baseIdPath = self.path.appending(ModelType.ID.parameter)
-//
-//            return CrudSiblingsController(siblingRelation: relation, basePath: baseIdPath, path: path)
-//    }
+    //    public func crudRouterCollection<ChildType, ThroughType>(
+    //        forSiblings relation: KeyPath<ModelType, Siblings<ModelType, ChildType, ThroughType>>,
+    //        at path: [PathComponentsRepresentable]
+    //    ) -> CrudSiblingsController<ChildType, ModelType, ThroughType> where
+    //        ChildType: Content,
+    //        ModelType.Database == ThroughType.Database,
+    //        ChildType.ID: Parameter,
+    //        ThroughType: ModifiablePivot,
+    //        ThroughType.Database: JoinSupporting,
+    //        ThroughType.Database == ChildType.Database {
+    //            let baseIdPath = self.path.appending(ModelType.ID.parameter)
+    //
+    //            return CrudSiblingsController(siblingRelation: relation, basePath: baseIdPath, path: path)
+    //    }
 }
 
 extension CrudController: RouteCollection {

diff --git a/Sources/CrudRouter/CrudParentController.swift b/Sources/CrudRouter/CrudParentController.swift
@@ -31,7 +31,7 @@ public extension CrudParentControllerProtocol {
             .unwrap(or: Abort(.notFound))
             .flatMap { child in
                 return child[keyPath: self.relation].get(on: req)
-            } 
+        }
     }
 }
 
@@ -52,6 +52,11 @@ public struct CrudParentController<ChildT: Model & Content, ParentT: Model & Con
     let path: [PathComponentsRepresentable]
 
     public init(relation: KeyPath<ChildType, Parent<ChildType, ParentType>>, basePath: [PathComponentsRepresentable], path: [PathComponentsRepresentable]) {
+        let path
+            = path.count == 0
+                ? [String(describing: ParentType.self).snakeCased()! as PathComponentsRepresentable]
+                : path
+
         self.relation = relation
         self.basePath = basePath
         self.path = path