From ee94988698b0f7a116996e2bbf2ce7586b8c2098 Mon Sep 17 00:00:00 2001 From: Mike Carman Date: Tue, 1 Apr 2025 11:41:13 -0400 Subject: [PATCH] fix for null downloaded --- .../UserInterfaceState.xcuserstate | Bin 35797 -> 37646 bytes .../Controllers/FuelEntryV2Controller.swift | 4 ++-- Sources/App/configure.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate index f8934036f3c29aae331de855481bfff59a43d040..33f154b8afd9ed09bdeb5b4ebfce68cc0b2a61dc 100644 GIT binary patch delta 18185 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 delta 17025 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 diff --git a/Sources/App/Controllers/FuelEntryV2Controller.swift b/Sources/App/Controllers/FuelEntryV2Controller.swift index 5fed9ff..4ab233f 100644 --- a/Sources/App/Controllers/FuelEntryV2Controller.swift +++ b/Sources/App/Controllers/FuelEntryV2Controller.swift @@ -126,12 +126,12 @@ struct FuelEntryV2Controller: RouteCollection { if(image){ //query = query.filter(\.$image) let wimage = try await query.paginate(for: req).map{ - img in FuelEntry.wimage(id: img.id, timestamp: img.timestamp, userID: img.userID, latitude: img.latitude, longitutde: img.longitude, product: img.product, make: img.make, model: img.model, serialNumber: img.serialNumber, tankID: img.tankID, fuelAmount: img.fuelAmount, fuelType: img.fuelType, isOverride: img.isOverride, image: img.image == nil ? Data(): img.image, downloaded: img.downloaded!) + img in FuelEntry.wimage(id: img.id, timestamp: img.timestamp, userID: img.userID, latitude: img.latitude, longitutde: img.longitude, product: img.product, make: img.make, model: img.model, serialNumber: img.serialNumber, tankID: img.tankID, fuelAmount: img.fuelAmount, fuelType: img.fuelType, isOverride: img.isOverride, image: img.image == nil ? Data(): img.image, downloaded: img.downloaded == nil ? false : img.downloaded!) } return try await wimage.encodeResponse(for: req) } else { let woimage = try await query.paginate(for: req).map{ - img in FuelEntry.woimage(id: img.id, timestamp: img.timestamp, userID: img.userID, latitude: img.latitude, longitutde: img.longitude, product: img.product, make: img.make, model: img.model, serialNumber: img.serialNumber, tankID: img.tankID, fuelAmount: img.fuelAmount, fuelType: img.fuelType, isOverride: img.isOverride, downloaded: img.downloaded!) + img in FuelEntry.woimage(id: img.id, timestamp: img.timestamp, userID: img.userID, latitude: img.latitude, longitutde: img.longitude, product: img.product, make: img.make, model: img.model, serialNumber: img.serialNumber, tankID: img.tankID, fuelAmount: img.fuelAmount, fuelType: img.fuelType, isOverride: img.isOverride, downloaded: img.downloaded == nil ? false : img.downloaded!) } return try await woimage.encodeResponse(for: req) } diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift index 9946914..b4e0ecd 100755 --- a/Sources/App/configure.swift +++ b/Sources/App/configure.swift @@ -10,7 +10,7 @@ public func configure(_ app: Application) async throws { app.routes.defaultMaxBodySize = "128mb" // let timeout = HTTPClient.Configuration.Timeout(connect: .seconds(300), read: .seconds(300)) // app.http.client.configuration.timeout = timeout - app.databases.use(.postgres(hostname: "127.0.0.1", port: 5432, username: "mcarman", password: "@ng31F@rm0823262", database: "fueling"), as: .psql) + app.databases.use(.postgres(hostname: "127.0.0.1", port: 5433, username: "mcarman", password: "@ng31F@rm0823262", database: "fueling"), as: .psql) // app.databases.use(DatabaseConfigurationFactory.postgres(configuration: .init( // hostname: Environment.get("DATABASE_HOST") ?? "localhost", // port: Environment.get("DATABASE_PORT").flatMap(Int.init(_:)) ?? 5433,