Wire BetaGroupProcessor up with TesterProcessor

Author: DechengMa

Sources/FileSystem/Beta Group/BetaGroupProcessor.swift

@@ -17,6 +17,7 @@ public struct BetaGroupProcessor: ResourceProcessor {
 
     var path: ResourcePath
 
+    @discardableResult
     func write(_ betaGroup: BetaGroup) throws -> File {
         try writeFile(betaGroup)
     }
@@ -28,14 +29,26 @@ public struct BetaGroupProcessor: ResourceProcessor {
     public func write(groupsWithTesters: [(betaGroup: BetaGroup, testers: [BetaTester])]) throws {
         deleteFile()
 
-        try groupsWithTesters.map { try write($0.betaGroup) }
+        let betagroups = try groupsWithTesters
+            .map { try write(betaTesters: $0.testers, into: $0.betaGroup) }
+
+        try betagroups.forEach { try write($0) }
+    }
+
+    private func write(betaTesters: [BetaTester], into betaGroup: BetaGroup) throws -> BetaGroup {
+        let testerProcessor = BetaTesterProcessor(folder: try getFolder())
+
+        var group = betaGroup
+        group.testers = try testerProcessor.write(group: group, testers: betaTesters)
+
+        return group
     }
 
 }
 
 extension BetaGroup: FileProvider {
     var fileName: String {
-        "\(app.id)_\(groupName).yml"
+        "\(app.bundleId ?? "")_\(groupName).yml"
     }
 
     func fileContent() throws -> FileContent {

Sources/FileSystem/ResourceProcessor.swift

@@ -33,23 +33,37 @@ protocol PathProvider {
     var path: ResourcePath { get }
 }
 
+extension PathProvider {
+    func getFolder() throws -> Folder {
+        var folder: Folder
+        switch path {
+        case .file(let path):
+            let standardizedPath = path as NSString
+            folder = try Folder(path: "").createSubfolderIfNeeded(at: standardizedPath.deletingLastPathComponent)
+        case .folder(let folderPath):
+            folder = try Folder(path: "").createSubfolderIfNeeded(at: folderPath)
+        }
+
+        return folder
+    }
+}
+
 extension ResourceWriter {
 
     func writeFile(_ resource: FileProvider) throws -> File {
         var file: File
-        var folder: Folder
         var fileName: String
 
         switch path {
         case .file(let path):
             let standardizedPath = path as NSString
-            folder = try Folder(path: "").createSubfolderIfNeeded(at: standardizedPath.deletingLastPathComponent)
             fileName = standardizedPath.lastPathComponent
-        case .folder(let folderPath):
+        case .folder(_):
             fileName = resource.fileName
-            folder = try Folder(path: "").createSubfolderIfNeeded(at: folderPath)
         }
 
+        let folder: Folder = try getFolder()
+
         switch try resource.fileContent() {
         case .data(let data):
             file = try folder.createFileIfNeeded(withName: fileName, contents: data)
@@ -77,7 +91,7 @@ extension ResourceWriter {
                     .files.forEach { try $0.delete() }
             }
         } catch {
-            print("\(error)")
+            // Skip delete failed error, if folder is missing.
         }
     }
 }