Release 1.2.3 (#66)

T-23 Add banners place position index
mayer1a · Oct 16, 2024 · 73ddb7d · 73ddb7d
2 parents 8212c00 + fd31b75
commit 73ddb7d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Sources/App/Helpers/DTOFactory/DTOFactory+Banners.swift b/Sources/App/Helpers/DTOFactory/DTOFactory+Banners.swift
@@ -13,11 +13,11 @@ extension DTOFactory {
 
     static func makeBanners(from banners: [MainBanner], fullModel: Bool = true) throws -> [MainBannerDTO] {
 
-        var bannersDTO = try banners.map { mainBanner in
+        var bannersDTO = try banners.sorted(by: { $0.placeIndex < $1.placeIndex }).map { mainBanner in
             try makeBanner(from: mainBanner, fullModel: fullModel)
         }
 
-        moveCategoryBannerToSecondPlace(in: &bannersDTO)
+//        moveBannersPlace(in: &bannersDTO)
 
         return bannersDTO
     }
@@ -101,11 +101,15 @@ extension DTOFactory {
 
 private extension DTOFactory {
 
-    static func moveCategoryBannerToSecondPlace(in banners: inout [MainBannerDTO]) {
+    static func moveBannersPlace(in banners: inout [MainBannerDTO]) {
         if let index = banners.firstIndex(where: { $0.categories != nil }), index != 1 {
             let element = banners.remove(at: index)
             banners.insert(element, at: 1)
         }
+        if let index = banners.firstIndex(where: { $0.placeType == .singleBanner }), index != banners.count - 1 {
+            let element = banners.remove(at: index)
+            banners.append(element)
+        }
     }
 
 }
diff --git a/Sources/App/Migrations/MainBanner/CreateMainBanner.swift b/Sources/App/Migrations/MainBanner/CreateMainBanner.swift
@@ -17,6 +17,7 @@ struct CreateMainBanner: AsyncMigration {
             .id()
             .field("title", .string)
             .field("place_type", placeType)
+            .field("place_index", .int, .required)
             .field("parent_id", .uuid, .references("main_banners", "id", onDelete: .cascade))
             .create()
     }

diff --git a/Sources/App/Models/DBEntity/MainBanner/MainBanner.swift b/Sources/App/Models/DBEntity/MainBanner/MainBanner.swift
@@ -21,6 +21,9 @@ final class MainBanner: Model, Content, @unchecked Sendable {
     @OptionalEnum(key: "place_type")
     var placeType: PlaceType?
 
+    @Field(key: "place_index")
+    var placeIndex: Int
+
     @OptionalChild(for: \.$mainBanner)
     var redirect: Redirect?
 
@@ -44,10 +47,11 @@ final class MainBanner: Model, Content, @unchecked Sendable {
 
     init() {}
 
-    init(id: UUID? = nil, title: String?, placeType: PlaceType?, parentID: MainBanner.IDValue? = nil) {
+    init(id: UUID? = nil, title: String?, placeType: PlaceType?, placeIndex: Int, parentID: MainBanner.IDValue? = nil) {
         self.id = id
         self.title = title
         self.placeType = placeType
+        self.placeIndex = placeIndex
         self.$parent.id = parentID
     }