feat: Initial csv parsing for uploading rooms for a project. Need to style the upload form.

Sources/CSVParser/Interface.swift

@@ -0,0 +1,43 @@
+import Dependencies
+import DependenciesMacros
+import ManualDCore
+import Parsing
+
+extension DependencyValues {
+  public var csvParser: CSVParser {
+    get { self[CSVParser.self] }
+    set { self[CSVParser.self] = newValue }
+  }
+}
+
+@DependencyClient
+public struct CSVParser: Sendable {
+  public var parseRooms: @Sendable (Room.CSV) async throws -> [Room.Create]
+}
+
+extension CSVParser: DependencyKey {
+  public static let testValue = Self()
+
+  public static let liveValue = Self(
+    parseRooms: { csv in
+      guard let string = String(data: csv.file, encoding: .utf8) else {
+        throw CSVParsingError("Unreadable file data")
+      }
+      let rows = try RoomCSVParser().parse(string[...].utf8)
+      let rooms = rows.reduce(into: [Room.Create]()) {
+        if case .room(let room) = $1 {
+          $0.append(room)
+        }
+      }
+      return rooms
+    }
+  )
+}
+
+public struct CSVParsingError: Error {
+  let reason: String
+
+  public init(_ reason: String) {
+    self.reason = reason
+  }
+}

Sources/CSVParser/Internal/Room+parsing.swift

@@ -0,0 +1,51 @@
+import ManualDCore
+import Parsing
+
+struct RoomCSVParser: Parser {
+  var body: some Parser<Substring.UTF8View, [RoomRowType]> {
+    Many {
+      RoomRowParser()
+    } separator: {
+      "\n".utf8
+    }
+  }
+}
+
+struct RoomRowParser: Parser {
+
+  var body: some Parser<Substring.UTF8View, RoomRowType> {
+    OneOf {
+      RoomCreateParser().map { RoomRowType.room($0) }
+      Prefix { $0 != UInt8(ascii: "\n") }
+        .map(.string)
+        .map { RoomRowType.header($0) }
+    }
+  }
+}
+
+enum RoomRowType {
+  case header(String)
+  case room(Room.Create)
+}
+
+struct RoomCreateParser: ParserPrinter {
+
+  var body: some ParserPrinter<Substring.UTF8View, Room.Create> {
+    ParsePrint {
+      Prefix { $0 != UInt8(ascii: ",") }.map(.string)
+      ",".utf8
+      Double.parser()
+      ",".utf8
+      Optionally {
+        Double.parser()
+      }
+      ",".utf8
+      Optionally {
+        Double.parser()
+      }
+      ",".utf8
+      Int.parser()
+    }
+    .map(.memberwise(Room.Create.init))
+  }
+}

Sources/DatabaseClient/Interface.swift

@@ -89,8 +89,8 @@ public struct DatabaseClient: Sendable {
 
   @DependencyClient
   public struct Rooms: Sendable {
-    public var create: @Sendable (Room.Create) async throws -> Room
-    public var createMany: @Sendable ([Room.Create]) async throws -> [Room]
+    public var create: @Sendable (Project.ID, Room.Create) async throws -> Room
+    public var createMany: @Sendable (Project.ID, [Room.Create]) async throws -> [Room]
     public var delete: @Sendable (Room.ID) async throws -> Void
     public var deleteRectangularSize:
       @Sendable (Room.ID, Room.RectangularSize.ID) async throws -> Room

Sources/DatabaseClient/Internal/Rooms.swift

@@ -10,14 +10,14 @@ extension DatabaseClient.Rooms: TestDependencyKey {
 
   public static func live(database: any Database) -> Self {
     .init(
-      create: { request in
-        let model = try request.toModel()
+      create: { projectID, request in
+        let model = try request.toModel(projectID: projectID)
         try await model.validateAndSave(on: database)
         return try model.toDTO()
       },
-      createMany: { rooms in
+      createMany: { projectID, rooms in
         try await rooms.asyncMap { request in
-          let model = try request.toModel()
+          let model = try request.toModel(projectID: projectID)
           try await model.validateAndSave(on: database)
           return try model.toDTO()
         }
@@ -83,7 +83,7 @@ extension DatabaseClient.Rooms: TestDependencyKey {
 
 extension Room.Create {
 
-  func toModel() throws -> RoomModel {
+  func toModel(projectID: Project.ID) throws -> RoomModel {
     return .init(
       name: name,
       heatingLoad: heatingLoad,

Sources/ManualDCore/Room.swift

@@ -96,8 +96,6 @@ public struct Room: Codable, Equatable, Identifiable, Sendable {
 extension Room {
   /// Represents the data required to create a new room for a project.
   public struct Create: Codable, Equatable, Sendable {
-    /// The project this room is associated with.
-    public let projectID: Project.ID
     /// A unique name for the room in the project.
     public let name: String
     /// The heating load required for the room (from Manual-J).
@@ -114,14 +112,12 @@ extension Room {
     }
 
     public init(
-      projectID: Project.ID,
       name: String,
       heatingLoad: Double,
       coolingTotal: Double? = nil,
       coolingSensible: Double? = nil,
       registerCount: Int = 1
     ) {
-      self.projectID = projectID
       self.name = name
       self.heatingLoad = heatingLoad
       self.coolingTotal = coolingTotal
@@ -130,6 +126,14 @@ extension Room {
     }
   }
 
+  public struct CSV: Equatable, Sendable {
+    public let file: Data
+
+    public init(file: Data) {
+      self.file = file
+    }
+  }
+
   /// Represents a rectangular size calculation that is stored in the
   /// database for a given room.
   ///

Sources/ManualDCore/Routes/ViewRoute.swift

@@ -188,6 +188,7 @@ extension SiteRoute.View.ProjectRoute {
   }
 
   public enum RoomRoute: Equatable, Sendable {
+    case csv(Room.CSV)
     case delete(id: Room.ID)
     case index
     case submit(Room.Create)
@@ -197,6 +198,23 @@ extension SiteRoute.View.ProjectRoute {
     static let rootPath = "rooms"
 
     public static let router = OneOf {
+      Route(.case(Self.csv)) {
+        Path {
+          rootPath
+          "csv"
+        }
+        Headers {
+          Field("Content-Type") { "multipart/form-data" }
+        }
+        Method.post
+        Body().map(.memberwise(Room.CSV.init))
+        // Body {
+        //   FormData {
+        //
+        //   }
+        //   .map(.memberwise(Room.CSV.init))
+        // }
+      }
       Route(.case(Self.delete)) {
         Path {
           rootPath
@@ -215,7 +233,7 @@ extension SiteRoute.View.ProjectRoute {
         Method.post
         Body {
           FormData {
-            Field("projectID") { Project.ID.parser() }
+            // Field("projectID") { Project.ID.parser() }
             Field("name", .string)
             Field("heatingLoad") { Double.parser() }
             Optionally {

Sources/ViewController/Live.swift

@@ -1,3 +1,4 @@
+import CSVParser
 import DatabaseClient
 import Dependencies
 import Elementary
@@ -284,10 +285,18 @@ extension SiteRoute.View.ProjectRoute.RoomRoute {
     on request: ViewController.Request,
     projectID: Project.ID
   ) async -> AnySendableHTML {
+    @Dependency(\.csvParser) var csvParser
     @Dependency(\.database) var database
 
     switch self {
 
+    case .csv(let csv):
+      return await roomsView(on: request, projectID: projectID) {
+        let rooms = try await csvParser.parseRooms(csv)
+        _ = try await database.rooms.createMany(projectID, rooms)
+      }
+    // return EmptyHTML()
+
     case .delete(let id):
       return await ResultView {
         try await database.rooms.delete(id)
@@ -298,7 +307,7 @@ extension SiteRoute.View.ProjectRoute.RoomRoute {
 
     case .submit(let form):
       return await roomsView(on: request, projectID: projectID) {
-        _ = try await database.rooms.create(form)
+        _ = try await database.rooms.create(projectID, form)
       }
 
     case .update(let id, let form):

Sources/ViewController/Views/Rooms/RoomForm.swift

@@ -47,8 +47,6 @@ struct RoomForm: HTML, Sendable {
         .hx.swap(.outerHTML)
       ) {
 
-        input(.class("hidden"), .name("projectID"), .value("\(projectID)"))
-
         if let id = room?.id {
           input(.class("hidden"), .name("id"), .value("\(id)"))
         }

Sources/ViewController/Views/Rooms/RoomsView.swift

@@ -11,6 +11,11 @@ struct RoomsView: HTML, Sendable {
   let rooms: [Room]
   let sensibleHeatRatio: Double?
 
+  private var csvRoute: String {
+    SiteRoute.router.path(for: .view(.project(.detail(projectID, .rooms(.index)))))
+      .appendingPath("csv")
+  }
+
   var body: some HTML {
     div(.class("flex w-full flex-col")) {
       PageTitleRow {
@@ -44,6 +49,18 @@ struct RoomsView: HTML, Sendable {
               .attributes(.class("border border-error"), when: sensibleHeatRatio == nil)
             }
             .attributes(.class("tooltip-open"), when: sensibleHeatRatio == nil)
+
+            Tooltip("Upload csv file", position: .left) {
+              form(
+                .hx.post(csvRoute),
+                .hx.target("body"),
+                .hx.swap(.outerHTML),
+                .custom(name: "enctype", value: "multipart/form-data")
+              ) {
+                input(.type(.file), .name("file"), .accept(".csv"))
+                SubmitButton()
+              }
+            }
           }
 
           div(.class("flex items-end space-x-4 font-bold")) {