Separate migrations from models

fpseverino · fpseverino · commit f231b7d154fc · 2024-12-23T17:29:24.000+01:00
diff --git a/Sources/FluentOrders/Models/Concrete Models/Order.swift b/Sources/FluentOrders/Models/Concrete Models/Order.swift
@@ -29,17 +29,17 @@ final public class Order: OrderModel, @unchecked Sendable {
     @Field(key: Order.FieldKeys.authenticationToken)
     public var authenticationToken: String
 
-    public required init() {}
+    public init() {}
 
-    public required init(typeIdentifier: String, authenticationToken: String) {
+    public init(typeIdentifier: String, authenticationToken: String) {
         self.typeIdentifier = typeIdentifier
         self.authenticationToken = authenticationToken
     }
 }
 
-extension Order: AsyncMigration {
+public struct CreateOrder: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(Order.FieldKeys.schemaName)
             .id()
             .field(Order.FieldKeys.createdAt, .datetime, .required)
             .field(Order.FieldKeys.updatedAt, .datetime, .required)
@@ -49,8 +49,10 @@ extension Order: AsyncMigration {
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(Order.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension Order {
diff --git a/Sources/FluentOrders/Models/Concrete Models/OrdersRegistration.swift b/Sources/FluentOrders/Models/Concrete Models/OrdersRegistration.swift
@@ -3,9 +3,6 @@ import FluentWallet
 
 /// The `Model` that stores orders registrations.
 final public class OrdersRegistration: OrdersRegistrationModel, @unchecked Sendable {
-    public typealias OrderType = Order
-    public typealias DeviceType = Device
-
     /// The schema name of the orders registration model.
     public static let schema = OrdersRegistration.FieldKeys.schemaName
 
@@ -14,33 +11,35 @@ final public class OrdersRegistration: OrdersRegistrationModel, @unchecked Senda
 
     /// The device for this registration.
     @Parent(key: OrdersRegistration.FieldKeys.deviceID)
-    public var device: DeviceType
+    public var device: Device
 
     /// The order for this registration.
     @Parent(key: OrdersRegistration.FieldKeys.orderID)
-    public var order: OrderType
+    public var order: Order
 
     public init() {}
 }
 
-extension OrdersRegistration: AsyncMigration {
+public struct CreateOrdersRegistration: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(OrdersRegistration.FieldKeys.schemaName)
             .field(.id, .int, .identifier(auto: true))
             .field(
                 OrdersRegistration.FieldKeys.deviceID, .int, .required,
-                .references(DeviceType.schema, .id, onDelete: .cascade)
+                .references(Device.FieldKeys.schemaName, .id, onDelete: .cascade)
             )
             .field(
                 OrdersRegistration.FieldKeys.orderID, .uuid, .required,
-                .references(OrderType.schema, .id, onDelete: .cascade)
+                .references(Order.FieldKeys.schemaName, .id, onDelete: .cascade)
             )
             .create()
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(OrdersRegistration.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension OrdersRegistration {
diff --git a/Sources/FluentPasses/Models/Concrete Models/Pass.swift b/Sources/FluentPasses/Models/Concrete Models/Pass.swift
@@ -5,8 +5,6 @@ import Foundation
 ///
 /// Uses a UUID so people can't easily guess pass serial numbers.
 final public class Pass: PassModel, @unchecked Sendable {
-    public typealias PersonalizationType = Personalization
-
     /// The schema name of the pass model.
     public static let schema = Pass.FieldKeys.schemaName
 
@@ -31,34 +29,36 @@ final public class Pass: PassModel, @unchecked Sendable {
 
     /// The user personalization info.
     @OptionalParent(key: Pass.FieldKeys.personalizationID)
-    public var personalization: PersonalizationType?
+    public var personalization: Personalization?
 
-    public required init() {}
+    public init() {}
 
-    public required init(typeIdentifier: String, authenticationToken: String) {
+    public init(typeIdentifier: String, authenticationToken: String) {
         self.typeIdentifier = typeIdentifier
         self.authenticationToken = authenticationToken
     }
 }
 
-extension Pass: AsyncMigration {
+public struct CreatePass: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(Pass.FieldKeys.schemaName)
             .id()
             .field(Pass.FieldKeys.updatedAt, .datetime, .required)
             .field(Pass.FieldKeys.typeIdentifier, .string, .required)
             .field(Pass.FieldKeys.authenticationToken, .string, .required)
             .field(
                 Pass.FieldKeys.personalizationID, .int,
-                .references(PersonalizationType.schema, .id)
+                .references(Personalization.FieldKeys.schemaName, .id)
             )
             .unique(on: Pass.FieldKeys.personalizationID)
             .create()
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(Pass.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension Pass {
diff --git a/Sources/FluentPasses/Models/Concrete Models/PassesRegistration.swift b/Sources/FluentPasses/Models/Concrete Models/PassesRegistration.swift
@@ -3,9 +3,6 @@ import FluentWallet
 
 /// The `Model` that stores passes registrations.
 final public class PassesRegistration: PassesRegistrationModel, @unchecked Sendable {
-    public typealias PassType = Pass
-    public typealias DeviceType = Device
-
     /// The schema name of the passes registration model.
     public static let schema = PassesRegistration.FieldKeys.schemaName
 
@@ -14,33 +11,35 @@ final public class PassesRegistration: PassesRegistrationModel, @unchecked Senda
 
     /// The device for this registration.
     @Parent(key: PassesRegistration.FieldKeys.deviceID)
-    public var device: DeviceType
+    public var device: Device
 
     /// The pass for this registration.
     @Parent(key: PassesRegistration.FieldKeys.passID)
-    public var pass: PassType
+    public var pass: Pass
 
     public init() {}
 }
 
-extension PassesRegistration: AsyncMigration {
+public struct CreatePassesRegistration: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(PassesRegistration.FieldKeys.schemaName)
             .field(.id, .int, .identifier(auto: true))
             .field(
                 PassesRegistration.FieldKeys.deviceID, .int, .required,
-                .references(DeviceType.schema, .id, onDelete: .cascade)
+                .references(Device.FieldKeys.schemaName, .id, onDelete: .cascade)
             )
             .field(
                 PassesRegistration.FieldKeys.passID, .uuid, .required,
-                .references(PassType.schema, .id, onDelete: .cascade)
+                .references(Pass.FieldKeys.schemaName, .id, onDelete: .cascade)
             )
             .create()
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(PassesRegistration.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension PassesRegistration {
diff --git a/Sources/FluentPasses/Models/Concrete Models/Personalization.swift b/Sources/FluentPasses/Models/Concrete Models/Personalization.swift
@@ -46,9 +46,9 @@ final public class Personalization: PersonalizationModel, @unchecked Sendable {
     public init() {}
 }
 
-extension Personalization: AsyncMigration {
+public struct CreatePersonalization: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(Personalization.FieldKeys.schemaName)
             .field(.id, .int, .identifier(auto: true))
             .field(Personalization.FieldKeys.fullName, .string)
             .field(Personalization.FieldKeys.givenName, .string)
@@ -61,8 +61,10 @@ extension Personalization: AsyncMigration {
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(Personalization.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension Personalization {
diff --git a/Sources/FluentWallet/Models/Concrete Models/Device.swift b/Sources/FluentWallet/Models/Concrete Models/Device.swift
@@ -24,9 +24,9 @@ final public class Device: DeviceModel, @unchecked Sendable {
     public init() {}
 }
 
-extension Device: AsyncMigration {
+public struct CreateDevice: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(Device.FieldKeys.schemaName)
             .field(.id, .int, .identifier(auto: true))
             .field(Device.FieldKeys.pushToken, .string, .required)
             .field(Device.FieldKeys.libraryIdentifier, .string, .required)
@@ -35,13 +35,15 @@ extension Device: AsyncMigration {
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(Device.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension Device {
-    enum FieldKeys {
-        static let schemaName = "devices"
+    package enum FieldKeys {
+        package static let schemaName = "devices"
         static let pushToken = FieldKey(stringLiteral: "push_token")
         static let libraryIdentifier = FieldKey(stringLiteral: "library_identifier")
     }
diff --git a/Sources/FluentWallet/Models/Concrete Models/LogEntry.swift b/Sources/FluentWallet/Models/Concrete Models/LogEntry.swift
@@ -19,17 +19,19 @@ final public class LogEntry: LogEntryModel, @unchecked Sendable {
     public init() {}
 }
 
-extension LogEntry: AsyncMigration {
+public struct CreateLogEntry: AsyncMigration {
     public func prepare(on database: any Database) async throws {
-        try await database.schema(Self.schema)
+        try await database.schema(LogEntry.FieldKeys.schemaName)
             .field(.id, .int, .identifier(auto: true))
             .field(LogEntry.FieldKeys.message, .string, .required)
             .create()
     }
 
     public func revert(on database: any Database) async throws {
-        try await database.schema(Self.schema).delete()
+        try await database.schema(LogEntry.FieldKeys.schemaName).delete()
     }
+
+    public init() {}
 }
 
 extension LogEntry {

Original file line number	Diff line number	Diff line change
`@@ -29,17 +29,17 @@ final public class Order: OrderModel, @unchecked Sendable {`
`29`	`29`	`@Field(key: Order.FieldKeys.authenticationToken)`
`30`	`30`	`public var authenticationToken: String`
`31`	`31`
`32`		`- public required init() {}`
	`32`	`+ public init() {}`
`33`	`33`
`34`		`- public required init(typeIdentifier: String, authenticationToken: String) {`
	`34`	`+ public init(typeIdentifier: String, authenticationToken: String) {`
`35`	`35`	`self.typeIdentifier = typeIdentifier`
`36`	`36`	`self.authenticationToken = authenticationToken`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-extension Order: AsyncMigration {`
	`40`	`+public struct CreateOrder: AsyncMigration {`
`41`	`41`	`public func prepare(on database: any Database) async throws {`
`42`		`- try await database.schema(Self.schema)`
	`42`	`+ try await database.schema(Order.FieldKeys.schemaName)`
`43`	`43`	`.id()`
`44`	`44`	`.field(Order.FieldKeys.createdAt, .datetime, .required)`
`45`	`45`	`.field(Order.FieldKeys.updatedAt, .datetime, .required)`
`@@ -49,8 +49,10 @@ extension Order: AsyncMigration {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public func revert(on database: any Database) async throws {`
`52`		`- try await database.schema(Self.schema).delete()`
	`52`	`+ try await database.schema(Order.FieldKeys.schemaName).delete()`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+ public init() {}`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`extension Order {`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ final public class Personalization: PersonalizationModel, @unchecked Sendable {`
`46`	`46`	`public init() {}`
`47`	`47`	`}`
`48`	`48`
`49`		`-extension Personalization: AsyncMigration {`
	`49`	`+public struct CreatePersonalization: AsyncMigration {`
`50`	`50`	`public func prepare(on database: any Database) async throws {`
`51`		`- try await database.schema(Self.schema)`
	`51`	`+ try await database.schema(Personalization.FieldKeys.schemaName)`
`52`	`52`	`.field(.id, .int, .identifier(auto: true))`
`53`	`53`	`.field(Personalization.FieldKeys.fullName, .string)`
`54`	`54`	`.field(Personalization.FieldKeys.givenName, .string)`
`@@ -61,8 +61,10 @@ extension Personalization: AsyncMigration {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public func revert(on database: any Database) async throws {`
`64`		`- try await database.schema(Self.schema).delete()`
	`64`	`+ try await database.schema(Personalization.FieldKeys.schemaName).delete()`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ public init() {}`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`extension Personalization {`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ final public class Device: DeviceModel, @unchecked Sendable {`
`24`	`24`	`public init() {}`
`25`	`25`	`}`
`26`	`26`
`27`		`-extension Device: AsyncMigration {`
	`27`	`+public struct CreateDevice: AsyncMigration {`
`28`	`28`	`public func prepare(on database: any Database) async throws {`
`29`		`- try await database.schema(Self.schema)`
	`29`	`+ try await database.schema(Device.FieldKeys.schemaName)`
`30`	`30`	`.field(.id, .int, .identifier(auto: true))`
`31`	`31`	`.field(Device.FieldKeys.pushToken, .string, .required)`
`32`	`32`	`.field(Device.FieldKeys.libraryIdentifier, .string, .required)`
`@@ -35,13 +35,15 @@ extension Device: AsyncMigration {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public func revert(on database: any Database) async throws {`
`38`		`- try await database.schema(Self.schema).delete()`
	`38`	`+ try await database.schema(Device.FieldKeys.schemaName).delete()`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ public init() {}`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`extension Device {`
`43`		`- enum FieldKeys {`
`44`		`- static let schemaName = "devices"`
	`45`	`+ package enum FieldKeys {`
	`46`	`+ package static let schemaName = "devices"`
`45`	`47`	`static let pushToken = FieldKey(stringLiteral: "push_token")`
`46`	`48`	`static let libraryIdentifier = FieldKey(stringLiteral: "library_identifier")`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,19 @@ final public class LogEntry: LogEntryModel, @unchecked Sendable {`
`19`	`19`	`public init() {}`
`20`	`20`	`}`
`21`	`21`
`22`		`-extension LogEntry: AsyncMigration {`
	`22`	`+public struct CreateLogEntry: AsyncMigration {`
`23`	`23`	`public func prepare(on database: any Database) async throws {`
`24`		`- try await database.schema(Self.schema)`
	`24`	`+ try await database.schema(LogEntry.FieldKeys.schemaName)`
`25`	`25`	`.field(.id, .int, .identifier(auto: true))`
`26`	`26`	`.field(LogEntry.FieldKeys.message, .string, .required)`
`27`	`27`	`.create()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public func revert(on database: any Database) async throws {`
`31`		`- try await database.schema(Self.schema).delete()`
	`31`	`+ try await database.schema(LogEntry.FieldKeys.schemaName).delete()`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ public init() {}`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`extension LogEntry {`