| @@ -156,19 +156,25 @@ struct FuelEntryV2Controller: RouteCollection { | |||||
| if(image){ | if(image){ | ||||
| //query = query.filter(\.$image) | //query = query.filter(\.$image) | ||||
| let wimage = try await query.paginate(for: req).map{ | 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) | return try await wimage.encodeResponse(for: req) | ||||
| } else { | } else { | ||||
| let woimage = try await query.paginate(for: req).map{ | 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) | return try await woimage.encodeResponse(for: req) | ||||
| } | } | ||||
| } | } | ||||