iOS (neu, ios/):
- SwiftUI-App: Login (Server + Keychain-Token), Kamera-Scanner (EAN/UPC/Code128),
Einlagern mit mehreren Chargen und eigenem MHD, Auslagern mit Chargenauswahl
oder FEFO, Artikelsuche, Anlegen mit Open-Food-Facts-Vorbefuellung.
- Home-Screen-Shortcuts: Schnellaktionen (langer Druck) und URL-Schema
projectgood://checkin | ://checkout fuer eigene Symbole via Kurzbefehle.
- project.yml (XcodeGen) + README mit Build-Anleitung. NICHT kompiliert - auf
diesem Rechner ist kein Xcode vorhanden.
Import-Modi (wie besprochen sinnvoll):
- add (Standard, nichts loeschen), replace_listed (Bestaende der in der Datei
genannten Produkte ersetzen - fuer Inventur), replace_all (alles ersetzen).
Geleerte Bestaende werden als Korrektur-Bewegung protokolliert; die Oberflaeche
fragt bei den zerstoerenden Modi nach.
Anzeige:
- "Bald ablaufend"/"Abgelaufen" zeigen jetzt das Gebinde ("1 Glas") mit der
Basiseinheit klein darunter (ExpiringItem liefert die Einheiten mit).
- MHD als Zeitspanne mit korrektem Numerus: "in 3 Tagen", "in 1 Woche",
"vor 2 Wochen", dazu heute/morgen/gestern.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
128 lines
4.9 KiB
Swift
128 lines
4.9 KiB
Swift
import Foundation
|
|
|
|
enum APIError: LocalizedError {
|
|
case notConfigured
|
|
case unauthorized
|
|
case server(String)
|
|
|
|
var errorDescription: String? {
|
|
switch self {
|
|
case .notConfigured: return "Server-Adresse fehlt. Bitte in den Einstellungen hinterlegen."
|
|
case .unauthorized: return "Nicht angemeldet oder Sitzung abgelaufen."
|
|
case .server(let message): return message
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Schlanker Client für die Project-Good-REST-API.
|
|
/// Alle Pfade laufen über /api (wie im Web, siehe web/nginx.conf).
|
|
actor APIClient {
|
|
static let shared = APIClient()
|
|
|
|
private var baseURL: URL? { Session.shared.baseURL }
|
|
private var token: String? { Session.shared.token }
|
|
|
|
// MARK: - Basis
|
|
|
|
private func makeRequest(_ path: String, method: String = "GET") throws -> URLRequest {
|
|
guard let baseURL else { throw APIError.notConfigured }
|
|
guard let url = URL(string: "api" + path, relativeTo: baseURL) else {
|
|
throw APIError.notConfigured
|
|
}
|
|
var request = URLRequest(url: url)
|
|
request.httpMethod = method
|
|
request.timeoutInterval = 15
|
|
if let token { request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization") }
|
|
return request
|
|
}
|
|
|
|
private func send<T: Decodable>(_ request: URLRequest, as type: T.Type) async throws -> T {
|
|
let (data, response) = try await URLSession.shared.data(for: request)
|
|
try check(response, data: data)
|
|
return try JSONDecoder().decode(T.self, from: data)
|
|
}
|
|
|
|
private func check(_ response: URLResponse, data: Data) throws {
|
|
guard let http = response as? HTTPURLResponse else { return }
|
|
guard !(200..<300).contains(http.statusCode) else { return }
|
|
if http.statusCode == 401 { throw APIError.unauthorized }
|
|
// FastAPI liefert Fehler als {"detail": "..."}
|
|
if let object = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
|
|
let detail = object["detail"] as? String {
|
|
throw APIError.server(detail)
|
|
}
|
|
throw APIError.server("Serverfehler (\(http.statusCode))")
|
|
}
|
|
|
|
private func jsonBody<T: Encodable>(_ request: inout URLRequest, _ value: T) throws {
|
|
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
|
|
request.httpBody = try JSONEncoder().encode(value)
|
|
}
|
|
|
|
// MARK: - Auth
|
|
|
|
func login(username: String, password: String) async throws -> TokenResponse {
|
|
var request = try makeRequest("/auth/login", method: "POST")
|
|
request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
|
|
var components = URLComponents()
|
|
components.queryItems = [
|
|
URLQueryItem(name: "username", value: username),
|
|
URLQueryItem(name: "password", value: password),
|
|
]
|
|
request.httpBody = components.percentEncodedQuery?.data(using: .utf8)
|
|
return try await send(request, as: TokenResponse.self)
|
|
}
|
|
|
|
func me() async throws -> MeResponse {
|
|
try await send(try makeRequest("/auth/me"), as: MeResponse.self)
|
|
}
|
|
|
|
// MARK: - Stammdaten
|
|
|
|
func units() async throws -> [Unit] {
|
|
try await send(try makeRequest("/units"), as: [Unit].self)
|
|
}
|
|
|
|
func locations() async throws -> [StorageLocation] {
|
|
try await send(try makeRequest("/locations"), as: [StorageLocation].self)
|
|
}
|
|
|
|
func searchProducts(_ query: String) async throws -> [Product] {
|
|
let escaped = query.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
|
|
return try await send(try makeRequest("/products?q=\(escaped)"), as: [Product].self)
|
|
}
|
|
|
|
func product(id: Int) async throws -> Product {
|
|
try await send(try makeRequest("/products/\(id)"), as: Product.self)
|
|
}
|
|
|
|
func lookup(barcode: String) async throws -> LookupResult {
|
|
let escaped = barcode.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
|
|
return try await send(try makeRequest("/products/lookup?barcode=\(escaped)"), as: LookupResult.self)
|
|
}
|
|
|
|
func createProduct(_ payload: NewProductRequest) async throws -> Product {
|
|
var request = try makeRequest("/products", method: "POST")
|
|
try jsonBody(&request, payload)
|
|
return try await send(request, as: Product.self)
|
|
}
|
|
|
|
// MARK: - Bestand
|
|
|
|
func lots(productId: Int) async throws -> [Lot] {
|
|
try await send(try makeRequest("/lots?product_id=\(productId)"), as: [Lot].self)
|
|
}
|
|
|
|
func checkInBatch(_ payload: BatchCheckInRequest) async throws -> StockResponse {
|
|
var request = try makeRequest("/stock/checkin/batch", method: "POST")
|
|
try jsonBody(&request, payload)
|
|
return try await send(request, as: StockResponse.self)
|
|
}
|
|
|
|
func checkOut(_ payload: CheckOutRequest) async throws -> StockResponse {
|
|
var request = try makeRequest("/stock/checkout", method: "POST")
|
|
try jsonBody(&request, payload)
|
|
return try await send(request, as: StockResponse.self)
|
|
}
|
|
}
|