Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
fpseverino committed Oct 31, 2024
1 parent d390bc7 commit c86ee9b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ let package = Package(
.library(name: "Orders", targets: ["Orders"]),
],
dependencies: [
.package(url: "https://github.com/vapor/vapor.git", from: "4.106.0"),
.package(url: "https://github.com/vapor/vapor.git", from: "4.106.1"),
.package(url: "https://github.com/vapor/fluent.git", from: "4.12.0"),
.package(url: "https://github.com/vapor/apns.git", from: "4.2.0"),
.package(url: "https://github.com/vapor-community/Zip.git", from: "2.2.3"),
.package(url: "https://github.com/apple/swift-certificates.git", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-certificates.git", from: "1.6.1"),
// used in tests
.package(url: "https://github.com/vapor/fluent-sqlite-driver.git", from: "4.8.0"),
],
Expand Down
11 changes: 5 additions & 6 deletions Sources/Orders/OrdersServiceCustom.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ where O == R.OrderType, D == R.DeviceType {
private let pemPrivateKeyPassword: String?
private let sslBinary: URL
private let logger: Logger?
private let encoder = JSONEncoder()

/// Initializes the service and registers all the routes required for Apple Wallet to work.
///
Expand Down Expand Up @@ -106,7 +107,7 @@ where O == R.OrderType, D == R.DeviceType {
apnsConfig,
eventLoopGroupProvider: .shared(app.eventLoopGroup),
responseDecoder: JSONDecoder(),
requestEncoder: JSONEncoder(),
requestEncoder: self.encoder,
as: .init(string: "orders"),
isDefault: false
)
Expand Down Expand Up @@ -478,16 +479,14 @@ extension OrdersServiceCustom {
throw OrdersError.templateNotDirectory
}

let tmp = FileManager.default.temporaryDirectory
let root = tmp.appendingPathComponent(UUID().uuidString, isDirectory: true)
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
try FileManager.default.copyItem(at: templateDirectory, to: root)
defer { _ = try? FileManager.default.removeItem(at: root) }

let encoder = JSONEncoder()
try await self.delegate.encode(order: order, db: db, encoder: encoder)
try await self.delegate.encode(order: order, db: db, encoder: self.encoder)
.write(to: root.appendingPathComponent("order.json"))

try self.generateSignatureFile(for: Self.generateManifestFile(using: encoder, in: root), in: root)
try self.generateSignatureFile(for: Self.generateManifestFile(using: self.encoder, in: root), in: root)

var files = try FileManager.default.contentsOfDirectory(at: templateDirectory, includingPropertiesForKeys: nil)
files.append(URL(fileURLWithPath: "order.json", relativeTo: root))
Expand Down
3 changes: 1 addition & 2 deletions Sources/Passes/PassesServiceCustom.swift
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,7 @@ extension PassesServiceCustom {
throw PassesError.templateNotDirectory
}

let tmp = FileManager.default.temporaryDirectory
let root = tmp.appendingPathComponent(UUID().uuidString, isDirectory: true)
let root = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString, isDirectory: true)
try FileManager.default.copyItem(at: templateDirectory, to: root)
defer { _ = try? FileManager.default.removeItem(at: root) }

Expand Down
2 changes: 1 addition & 1 deletion Tests/OrdersTests/OrdersTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Zip

@testable import Orders

@Suite("Orders Tests")
@Suite("Orders Tests", .serialized)
struct OrdersTests {
let ordersURI = "/api/orders/v1/"
let decoder = JSONDecoder()
Expand Down
2 changes: 1 addition & 1 deletion Tests/PassesTests/PassesTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Zip

@testable import Passes

@Suite("Passes Tests")
@Suite("Passes Tests", .serialized)
struct PassesTests {
let passesURI = "/api/passes/v1/"
let decoder = JSONDecoder()
Expand Down

0 comments on commit c86ee9b

Please sign in to comment.