Merge pull request #14 from nodes-vapor/remove-filter

Removed auto filter

.gitignore

@@ -1,3 +1,4 @@
+*.swp
 Packages
 .build
 .idea
@@ -7,4 +8,4 @@ Config/secrets/
 .DS_Store
 node_modules/
 bower_components/
-.swift-version
+.swift-version

Sources/NodesModel.swift

@@ -53,95 +53,3 @@ extension NodesModel {
         }
     }
 }
-
-extension NodesModel {
-    public static func find(_ id: NodeRepresentable) throws -> Self? {
-        guard let idKey = database?.driver.idKey else {
-            return nil
-        }
-
-        var query = try Self.query().filter(idKey, .equals, id)
-        if Self.softDeletable {
-            query = try query.filter("deletedAt", .equals, Node.null)
-        }
-
-        return try query.first()
-    }
-
-    public static func all() throws -> [Self] {
-        var query = try Self.query()
-        if Self.softDeletable {
-            query = try query.filter("deletedAt", .equals, Node.null)
-        }
-
-        return try query.all()
-    }
-}
-
-extension Query where T: NodesModel {
-    public func first() throws -> T? {
-        let query = self
-        query.action = .fetch
-        query.limit = Limit(count: 1)
-
-        if T.softDeletable {
-            query.filters = [
-                Filter(T.self, .compare("deletedAt", .equals, Node.null))
-            ]
-        }
-
-        var model = try query.run().first
-        model?.exists = true
-
-        return model
-    }
-
-    public func all() throws -> [T] {
-        let query = self
-        query.action = .fetch
-
-        if T.softDeletable {
-            query.filters = [
-                Filter(T.self, .compare("deletedAt", .equals, Node.null))
-            ]
-        }
-
-        let models = try query.run()
-        models.forEach { model in
-            var model = model
-            model.exists = true
-        }
-
-        return models
-    }
-
-
-    @discardableResult
-    public func run() throws -> [T] {
-        var models: [T] = []
-
-        // filter out soft-deleted models on fetch and count queries
-        if action == .fetch || action == .count, T.softDeletable {
-            let filter = Filter(T.self, .compare("deletedAt", .equals, Node.null))
-            filters.append(filter)
-        }
-
-        if case .array(let array) = try raw() {
-            for result in array {
-                do {
-                    var model = try T(node: result)
-                    if case .object(let dict) = result {
-                        model.id = dict["id"]
-                    }
-                    models.append(model)
-                } catch {
-                    print("Could not initialize \(T.self), skipping: \(error)")
-                }
-            }
-        } else {
-            print("Unsupported Node type, only array is supported.")
-        }
-
-        return models
-    }
-}

Tests/LinuxMain.swift

@@ -5,5 +5,4 @@ import XCTest
 XCTMain([
     testCase(DatabaseMySQLTests.allTests),
     testCase(DateSugarTests.allTests),
-    testCase(NodesModelTests.allTests),
 ])

Tests/SugarTests/NodesModelTests.swift

@@ -1,3 +1,4 @@
+/*
 import Vapor
 import Fluent
 import XCTest
@@ -107,3 +108,4 @@ struct TestUser: NodesModel {
     static func prepare(_ database: Database) throws {}
     static func revert(_ database: Database) throws {}
 }
+*/