Made getDistrictList static

Author: Ziggydave1

Sources/SwiftVue/DataProvider/DataProvider.swift

@@ -20,7 +20,8 @@ public protocol DataProvider {
     func getReportCard(documentGUID: String) async throws -> String
     func listDocuments() async throws -> String
     func getDocument(documentGUID: String) async throws -> String
-    func getDistrictList(zip: String) async throws -> [DistrictInfo]
     func getMailInboxCount() async throws -> String
     func verifyCredentials() async throws -> Bool
+    
+    static func getDistrictList(zip: String) async throws -> [DistrictInfo]
 }

Sources/SwiftVue/DataProvider/PreviewDataProvider.swift

@@ -8,17 +8,15 @@
 import Foundation
 
 public class PreviewDataProvider: DataProvider {
+    public static var delayNanoseconds = UInt64(2e9)
     private let validCredentials: Bool
-    public var delayNanoseconds: UInt64
 
-    public init(credentials: Credentials = Credentials.preview, delayNanoseconds: UInt64 = UInt64(2e9)) {
+    public init(credentials: Credentials = Credentials.preview) {
         self.validCredentials = credentials == Credentials.preview
-        self.delayNanoseconds = delayNanoseconds
     }
 
-    public init(username: String, password: String, districtURL: String, delayNanoseconds: UInt64 = UInt64(2e9)) {
+    public init(username: String, password: String, districtURL: String) {
         self.validCredentials = Credentials(username: username, password: password, districtURL: districtURL) == Credentials.preview
-        self.delayNanoseconds = delayNanoseconds
     }
 
     public func getMessages() async throws -> String {
@@ -38,7 +36,7 @@ public class PreviewDataProvider: DataProvider {
 
     public func getGradebook(reportPeriod: Int?) async throws -> Gradebook {
         guard validCredentials else { throw SwiftVueError.invalidCredentials }
-        try await delay()
+        try await Self.delay()
         switch reportPeriod {
         case 0: return PreviewData.gradebook1
         case 1: return PreviewData.gradebook2
@@ -56,13 +54,13 @@ public class PreviewDataProvider: DataProvider {
 
     public func getStudentInfo() async throws -> StudentInfo {
         guard validCredentials else { throw SwiftVueError.invalidCredentials }
-        try await delay()
+        try await Self.delay()
         return PreviewData.student1
     }
 
     public func getSchedule(termIndex: Int?) async throws -> Schedule {
         guard validCredentials else { throw SwiftVueError.invalidCredentials }
-        try await delay()
+        try await Self.delay()
         switch termIndex {
         case 0: return PreviewData.schedule1
         case 1: return PreviewData.schedule2
@@ -96,12 +94,6 @@ public class PreviewDataProvider: DataProvider {
         throw SwiftVueError.notImplemented("PreviewDataProvider.getDocument")
     }
 
-    public func getDistrictList(zip: String) async throws -> [DistrictInfo] {
-        guard validCredentials else { throw SwiftVueError.invalidCredentials }
-        try await delay()
-        return PreviewData.districtList1
-    }
-    
     public func getMailInboxCount() async throws -> String {
         guard validCredentials else { throw SwiftVueError.invalidCredentials }
         throw SwiftVueError.notImplemented("PreviewDataProvider.getMailInboxCount")
@@ -111,7 +103,12 @@ public class PreviewDataProvider: DataProvider {
         return validCredentials
     }
 
-    private func delay() async throws {
-        try await Task.sleep(nanoseconds: delayNanoseconds)
+    public static func getDistrictList(zip: String) async throws -> [DistrictInfo] {
+        try await delay()
+        return PreviewData.districtList1
+    }
+    
+    private static func delay() async throws {
+        try await Task.sleep(nanoseconds: Self.delayNanoseconds)
     }
 }

Sources/SwiftVue/DataProvider/RealDataProvider.swift

@@ -20,28 +20,77 @@ public class RealDataProvider: DataProvider {
         self.credentials = Credentials(username: username, password: password, districtURL: districtURL)
     }
 
-    private func processRequest(method: String, paramString: String, handle: String, user: Bool) async throws -> String {
-        let username: String = if user { credentials.username } else { Self.edupointCredentials.username }
-        let password: String = if user { credentials.password } else { Self.edupointCredentials.password }
+    private func processRequest(method: String, paramString: String) async throws -> String {
+        let body: String =
+            """
+            <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+            <soap:Body>
+            <ProcessWebServiceRequest xmlns="http://edupoint.com/webservices/">
+            <userID>\(credentials.username)</userID>
+            <password>\(credentials.password)</password>
+            <skipLoginLog>1</skipLoginLog>
+            <parent>0</parent>
+            <webServiceHandleName>PXPWebServices</webServiceHandleName>
+            <methodName>\(method)</methodName>
+            <paramStr>\(paramString)</paramStr>
+            </ProcessWebServiceRequest>
+            </soap:Body>
+            </soap:Envelope>
+            """
+        
+        guard let url = URL(string: credentials.districtURL + "/Service/PXPCommunication.asmx") else {
+            throw SwiftVueError.invalidURL
+        }
+        
+        var request: URLRequest = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData)
+        request.addValue("text/xml", forHTTPHeaderField: "Content-Type")
+        request.addValue("http://edupoint.com/webservices/ProcessWebServiceRequest", forHTTPHeaderField: "SOAPAction")
+        request.httpMethod = "POST"
+        request.httpBody = body.data(using: .utf8)
+        
+        let session = URLSession(configuration: URLSessionConfiguration.ephemeral)
+        session.configuration.requestCachePolicy = .reloadIgnoringLocalAndRemoteCacheData
+        
+        let (data, response) = try await session.data(for: request)
+        
+        guard let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+            throw SwiftVueError.invalidResponse
+        }
+        
+        guard let result = String(data: data, encoding: .utf8) else {
+            throw SwiftVueError.couldNotDecodeResponse
+        }
 
+        return result
+    }
+    
+    public func makeRequest(method: String, params: [String: String] = [:]) async throws -> String {
+        let paramStr = "&lt;Parms&gt;" + params.reduce("") { accumulation, pair in
+            accumulation + "&lt;\(pair.key)&gt;\(pair.value)&lt;/\(pair.key)&gt;"
+        } + "&lt;/Parms&gt;"
+        let processedRequest = try await processRequest(method: method, paramString: paramStr)
+        return processedRequest.replacingEscapements()
+    }
+    
+    private static func processRequest(method: String, paramString: String) async throws -> String {
         let body: String =
             """
             <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
             <soap:Body>
             <ProcessWebServiceRequest xmlns="http://edupoint.com/webservices/">
-            <userID>\(username)</userID>
-            <password>\(password)</password>
+            <userID>\(edupointCredentials.username)</userID>
+            <password>\(edupointCredentials.password)</password>
             <skipLoginLog>1</skipLoginLog>
             <parent>0</parent>
-            <webServiceHandleName>\(handle)</webServiceHandleName>
+            <webServiceHandleName>HDInfoServices</webServiceHandleName>
             <methodName>\(method)</methodName>
             <paramStr>\(paramString)</paramStr>
             </ProcessWebServiceRequest>
             </soap:Body>
             </soap:Envelope>
             """
 
-        guard let url = URL(string: (user ? credentials.districtURL : Self.edupointCredentials.districtURL) + (user ? "/Service/PXPCommunication.asmx" : "/Service/HDInfoCommunication.asmx")) else {
+        guard let url = URL(string: edupointCredentials.districtURL + "/Service/HDInfoCommunication.asmx") else {
             throw SwiftVueError.invalidURL
         }
 
@@ -67,24 +116,24 @@ public class RealDataProvider: DataProvider {
         return result
     }
 
-    public func makeRequest(method: String, params: [String: String] = [:], handle: String, user: Bool = true) async throws -> String {
+    public static func makeRequest(method: String, params: [String: String] = [:]) async throws -> String {
         let paramStr = "&lt;Parms&gt;" + params.reduce("") { accumulation, pair in
             accumulation + "&lt;\(pair.key)&gt;\(pair.value)&lt;/\(pair.key)&gt;"
         } + "&lt;/Parms&gt;"
-        let processedRequest = try await processRequest(method: method, paramString: paramStr, handle: handle, user: user)
+        let processedRequest = try await processRequest(method: method, paramString: paramStr)
         return processedRequest.replacingEscapements()
     }
 
     public func getMessages() async throws -> String {
-        return try await makeRequest(method: "GetPXPMessages", handle: "PXPWebServices")
+        return try await makeRequest(method: "GetPXPMessages")
     }
 
     public func getCalendar() async throws -> String {
-        return try await makeRequest(method: "StudentCalendar", handle: "PXPWebServices")
+        return try await makeRequest(method: "StudentCalendar")
     }
 
     public func getAttendance() async throws -> Attendance {
-        let result = try await makeRequest(method: "Attendance", handle: "PXPWebServices")
+        let result = try await makeRequest(method: "Attendance")
 
         if !result.contains("Attendance") {
             throw SwiftVueError.invalidCredentials
@@ -98,7 +147,7 @@ public class RealDataProvider: DataProvider {
         if let period = reportPeriod {
             params = ["ReportPeriod": "\(period)"]
         }
-        let result = try await makeRequest(method: "Gradebook", params: params, handle: "PXPWebServices")
+        let result = try await makeRequest(method: "Gradebook", params: params)
 
         if !result.contains("Gradebook") {
             throw SwiftVueError.invalidCredentials
@@ -108,11 +157,11 @@ public class RealDataProvider: DataProvider {
     }
 
     public func getClassNotes() async throws -> String {
-        return try await makeRequest(method: "StudentHWNotes", handle: "PXPWebServices")
+        return try await makeRequest(method: "StudentHWNotes")
     }
 
     public func getStudentInfo() async throws -> StudentInfo {
-        let string = try await makeRequest(method: "StudentInfo", handle: "PXPWebServices")
+        let string = try await makeRequest(method: "StudentInfo")
         if !string.contains("StudentInfo") {
             throw SwiftVueError.invalidCredentials
         }
@@ -124,47 +173,47 @@ public class RealDataProvider: DataProvider {
         if let term = termIndex {
             params = ["TermIndex": "\(term)"]
         }
-        let string = try await makeRequest(method: "StudentClassList", params: params, handle: "PXPWebServices")
+        let string = try await makeRequest(method: "StudentClassList", params: params)
         if !string.contains("StudentClassSchedule") {
             throw SwiftVueError.invalidCredentials
         }
         return try ScheduleParser(string: string).parse()
     }
 
     public func getSchoolInfo() async throws -> String {
-        return try await makeRequest(method: "StudentSchoolInfo", handle: "PXPWebServices")
+        return try await makeRequest(method: "StudentSchoolInfo")
     }
 
     public func listReportCards() async throws -> String {
-        return try await makeRequest(method: "GetReportCardInitialData", handle: "PXPWebServices")
+        return try await makeRequest(method: "GetReportCardInitialData")
     }
 
     public func getReportCard(documentGUID: String) async throws -> String {
-        return try await makeRequest(method: "GetReportCardDocumentData", params: ["DocumentGU": documentGUID], handle: "PXPWebServices")
+        return try await makeRequest(method: "GetReportCardDocumentData", params: ["DocumentGU": documentGUID])
     }
 
     public func listDocuments() async throws -> String {
-        return try await makeRequest(method: "GetStudentDocumentInitialData", handle: "PXPWebServices")
+        return try await makeRequest(method: "GetStudentDocumentInitialData")
     }
 
     public func getDocument(documentGUID: String) async throws -> String {
-        return try await makeRequest(method: "GetContentOfAttachedDoc", params: ["DocumentGU": documentGUID], handle: "PXPWebServices")
-    }
-    
-    public func getDistrictList(zip: String) async throws -> [DistrictInfo] {
-        let string = try await makeRequest(method: "GetMatchingDistrictList", params: ["Key":"5E4B7859-B805-474B-A833-FDB15D205D40", "MatchToDistrictZipCode":"\(zip)"], handle: "HDInfoServices", user: false)
-        if !string.contains("DistrictList") {
-            throw SwiftVueError.invalidCredentials
-        }
-        return try DistrictInfoParser(string: string).parse()
+        return try await makeRequest(method: "GetContentOfAttachedDoc", params: ["DocumentGU": documentGUID])
     }
 
     public func getMailInboxCount() async throws -> String {
-        return try await makeRequest(method: "SynergyMailGetInboxCount", handle: "PXPWebServices")
+        return try await makeRequest(method: "SynergyMailGetInboxCount")
     }
 
     public func verifyCredentials() async throws -> Bool {
         let string = try await getMailInboxCount()
         return string.contains("SynergyMailInboxCountXML")
     }
+    
+    public static func getDistrictList(zip: String) async throws -> [DistrictInfo] {
+        let string = try await makeRequest(method: "GetMatchingDistrictList", params: ["Key":"5E4B7859-B805-474B-A833-FDB15D205D40", "MatchToDistrictZipCode":"\(zip)"])
+        if !string.contains("DistrictList") {
+            throw SwiftVueError.invalidCredentials
+        }
+        return try DistrictInfoParser(string: string).parse()
+    }
 }

Sources/SwiftVue/StudentVue/StudentVue.swift

@@ -73,8 +73,8 @@ extension StudentVue {
         return try await dataProvider.getDocument(documentGUID: documentGUID)
     }
 
-    public func getDistrictList(zip: String) async throws -> [DistrictInfo] {
-        return try await dataProvider.getDistrictList(zip: zip)
+    public static func getDistrictList(zip: String) async throws -> [DistrictInfo] {
+        return try await RealDataProvider.getDistrictList(zip: zip)
     }
 
     public func getMailInboxCount() async throws -> String {