From 06635c9d2fb50ef2c5ab2b7d189edec3a2d5e139 Mon Sep 17 00:00:00 2001
From: John Rommel Estropia <rommel.estropia@gmail.com>
Date: Mon, 2 Oct 2017 08:04:28 +0900
Subject: [PATCH] orderby utilities

---
 CoreStoreTests/DynamicModelTests.swift |  1 +
 Sources/OrderBy.swift                  | 67 ++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/CoreStoreTests/DynamicModelTests.swift b/CoreStoreTests/DynamicModelTests.swift
index 30e97cd..4d68ddb 100644
--- a/CoreStoreTests/DynamicModelTests.swift
+++ b/CoreStoreTests/DynamicModelTests.swift
@@ -237,6 +237,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                     _ = transaction.fetchAll(
                         From<Dog>()
                             .where(\.age == 10 && \Animal.species == "Dog")
+                            .orderBy(.ascending({ $0.species }))
                     )
                     _ = transaction.fetchAll(
                         From<Dog>(),
diff --git a/Sources/OrderBy.swift b/Sources/OrderBy.swift
index f5199c4..247b66a 100644
--- a/Sources/OrderBy.swift
+++ b/Sources/OrderBy.swift
@@ -257,6 +257,73 @@ public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause
     }
 }
 
+public extension OrderBy where D: CoreStoreObject {
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in ascending order
+     */
+    public static func ascending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: ValueContainer<DSub>.Required<T> {
+        
+        return .ascending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in ascending order
+     */
+    public static func ascending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: ValueContainer<DSub>.Optional<T> {
+        
+        return .ascending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in ascending order
+     */
+    public static func ascending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: TransformableContainer<DSub>.Required<T> {
+        
+        return .ascending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in ascending order
+     */
+    public static func ascending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: TransformableContainer<DSub>.Optional<T> {
+        
+        return .ascending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in descending order
+     */
+    public static func descending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: ValueContainer<DSub>.Required<T> {
+        
+        return .descending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in descending order
+     */
+    public static func descending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: ValueContainer<DSub>.Optional<T> {
+        
+        return .descending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in descending order
+     */
+    public static func descending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: TransformableContainer<DSub>.Required<T> {
+        
+        return .descending(attribute(D.meta).keyPath)
+    }
+    
+    /**
+     Indicates that the `KeyPathString` should be sorted in descending order
+     */
+    public static func descending<DSub, A, T>(_ attribute: (D) -> A) -> SortKey where A: TransformableContainer<DSub>.Optional<T> {
+        
+        return .descending(attribute(D.meta).keyPath)
+    }
+}
+
 
 // MARK: - OrderByClause