Merge pull request #1 from AddaMeSPB/beta

Here we NW go

Package.swift

@@ -23,7 +23,6 @@ let package = Package(
 
         // Route
         .package(url: "https://github.com/pointfreeco/vapor-routing.git", from: "0.1.1"),
-        .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.9.2"),
         .package(url: "https://github.com/pointfreeco/swift-url-routing.git", from: "0.3.0"),
         .package(url: "https://github.com/OpenKitten/BSON.git", from: "7.0.0")
     ],

Sources/NWSharedModels/Auth/AuthMocks.swift

@@ -1,3 +1,5 @@
+import BSON
+
 extension VerifySMSInOutput {
     static public var draff: VerifySMSInOutput = .init(
         phoneNumber: "+79218821217",
@@ -8,7 +10,7 @@ extension VerifySMSInOutput {
 }
 
 extension LoginResponseP {
-    static public var draff: LoginResponseP = .init(status: "online", user: .init(fullName: "Saroar", email: "", role: .superAdmin, language: .english), access: .draff)
+    static public var draff: LoginResponseP = .init(status: "online", user: .init(id: ObjectId(),fullName: "Saroar", email: "", role: .superAdmin, language: .english), access: .draff)
 }
 
 extension RefreshTokenResponse {

Sources/NWSharedModels/SiteRoute.swift

@@ -14,7 +14,7 @@ public enum WordsRoute: Equatable {
 
 public let wordsRouter = OneOf {
     Route(.case(WordsRoute.list)) {
-        Path { "api/words" }
+        Path { "api"; "words" }
         Parse(.memberwise(Language.init)) {
             Query {
                 Field("from", .string, default: "")

Sources/NWSharedModels/SwiftUI+Extension.swift

@@ -5,8 +5,6 @@
 //  Created by Saroar Khandoker on 08.12.2021.
 //
 
-import SwiftUI
-
 //extension View {
 //  @ViewBuilder
 //  public func stackNavigationViewStyle() -> some View {

Sources/NWSharedModels/URLResponse+extension.swift

@@ -1,4 +1,7 @@
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
 
 extension URLResponse {
     public func isResponseOK() -> Bool {

Sources/NWSharedModels/User/UserModel.swift

@@ -84,7 +84,7 @@ extension UserModel {
 extension UserModel {
 	public func mapGet() -> UserGetObject {
         return .init(
-            id: id,
+            id: id ?? ObjectId(),
             fullName: fullName,
             phoneNumber: phoneNumber,
             email: email,
@@ -139,7 +139,24 @@ extension UserModel {
 
 extension UserGetObject: Content {
     public init(from user: UserModel) {
-        self.init(id: user.id, fullName: user.fullName, phoneNumber: user.phoneNumber, email: user.email, role: user.role, language: user.language)
+        self.init(
+            id: user.id ?? ObjectId(),
+            fullName: user.fullName,
+            phoneNumber: user.phoneNumber,
+            email: user.email,
+            role: user.role,
+            language: user.language
+        )
+    }
+}
+
+extension UserModel {
+    public func update(_ input: UserGetObject) async throws {
+        fullName = input.fullName
+        language = input.language
+        role = input.role
+        email = input.email
+        phoneNumber = input.phoneNumber
     }
 }
 #endif

Sources/NWSharedModels/User/UserObject.swift

@@ -28,15 +28,15 @@ public struct UserCreateObject: Codable {
 
 public struct UserGetObject: Codable {
 
-    public let id: ObjectId?
-    public let fullName: String
-    public let phoneNumber: String?
-    public let email: String?
-    public let role: UserRole
-    public let language: UserLanguage
+    public var id: ObjectId
+    public var fullName: String
+    public var phoneNumber: String?
+    public var email: String?
+    public var role: UserRole
+    public var language: UserLanguage
 
     public init(
-        id: ObjectId? = nil,
+        id: ObjectId,
         fullName: String,
         phoneNumber: String? = nil,
         email: String? = nil,
@@ -52,7 +52,13 @@ public struct UserGetObject: Codable {
     }
 }
 
-extension UserGetObject: Equatable {}
+extension UserGetObject: Equatable {
+    public static func ==(lhs: Self, rhs: Self) -> Bool {
+        return lhs.id == rhs.id && lhs.role == rhs.role
+        && lhs.language == rhs.language && lhs.fullName == rhs.fullName
+        && lhs.phoneNumber == rhs.phoneNumber
+    }
+}
 
 public struct UserGetPublicObject: Codable {