From 976f328f372d7fb02f8bf937ee5bac3c3c96c002 Mon Sep 17 00:00:00 2001 From: Mike Carman Date: Thu, 17 Apr 2025 12:03:49 -0400 Subject: [PATCH] small modification to rpm query --- .../UserInterfaceState.xcuserstate | Bin 57279 -> 57720 bytes .../Controllers/FuelEntryV2Controller.swift | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate index 708a1d137d6a6f10c655ff40d3081f900b191908..947fea3664f4b420ca254a82ae1acab35a5a7659 100644 GIT binary patch delta 20844 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 BnKl3b delta 20708 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 diff --git a/Sources/App/Controllers/FuelEntryV2Controller.swift b/Sources/App/Controllers/FuelEntryV2Controller.swift index 2fa8b85..ef1d7f7 100644 --- a/Sources/App/Controllers/FuelEntryV2Controller.swift +++ b/Sources/App/Controllers/FuelEntryV2Controller.swift @@ -156,19 +156,25 @@ 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 == nil ? false : img.downloaded!, loaddate: img.loaddate == nil ? nil : img.loaddate, pulldate: Date()) + 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!, loaddate: img.loaddate == nil ? nil : img.loaddate, pulldate: previous == true ? img.pulldate : Date()) } - wimage.items.forEach{ - _ = $0.toFuelEntry().save(on: req.db) + if(!previous){ + wimage.items.forEach{ + _ = $0.toFuelEntry().save(on: req.db) + } } + 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 == nil ? false : img.downloaded!, loaddate: img.loaddate == nil ? nil : img.loaddate, pulldate: Date()) + 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!, loaddate: img.loaddate == nil ? nil : img.loaddate, pulldate: previous == true ? img.pulldate : Date()) } - woimage.items.forEach { - _ = $0.toFuelEntry().save(on: req.db) + if(!previous) { + woimage.items.forEach { + _ = $0.toFuelEntry().save(on: req.db) + } } + return try await woimage.encodeResponse(for: req) } }