Add pagination support for item tags list

dadachi · claude · dadachi · commit 8ad1c2049b50 · 2026-04-03T16:31:08.000+09:00
Add PaginationMeta model, query parameter support in networking layer,
and infinite scroll in ItemTagListView. ShopDetailView continues
fetching all items without pagination for backward compatibility.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/NativeAppTemplate.xcodeproj/project.pbxproj b/NativeAppTemplate.xcodeproj/project.pbxproj
@@ -82,6 +82,7 @@
 		017278612D7D83E700CE424F /* ItemTagData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172785D2D7D83E700CE424F /* ItemTagData.swift */; };
 		017278622D7D83E700CE424F /* ItemTag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172785C2D7D83E700CE424F /* ItemTag.swift */; };
 		017278632D7D83E700CE424F /* ItemTagState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172785F2D7D83E700CE424F /* ItemTagState.swift */; };
+		4A8DA0DEF6F142C3A127058A /* PaginationMeta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2FE8A6D1D27C458389C4F61A /* PaginationMeta.swift */; };
 		017278642D7D83E700CE424F /* ItemTagInfoFromNdefMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0172785E2D7D83E700CE424F /* ItemTagInfoFromNdefMessage.swift */; };
 		017278652D7D83E700CE424F /* ItemTagType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278602D7D83E700CE424F /* ItemTagType.swift */; };
 		017278682D7D83F600CE424F /* ScanState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 017278672D7D83F600CE424F /* ScanState.swift */; };
@@ -260,6 +261,7 @@
 		0172785D2D7D83E700CE424F /* ItemTagData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagData.swift; sourceTree = "<group>"; };
 		0172785E2D7D83E700CE424F /* ItemTagInfoFromNdefMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagInfoFromNdefMessage.swift; sourceTree = "<group>"; };
 		0172785F2D7D83E700CE424F /* ItemTagState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagState.swift; sourceTree = "<group>"; };
+		2FE8A6D1D27C458389C4F61A /* PaginationMeta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaginationMeta.swift; sourceTree = "<group>"; };
 		017278602D7D83E700CE424F /* ItemTagType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagType.swift; sourceTree = "<group>"; };
 		017278672D7D83F600CE424F /* ScanState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanState.swift; sourceTree = "<group>"; };
 		0172786A2D7D840A00CE424F /* ShowTagInfoScanResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowTagInfoScanResult.swift; sourceTree = "<group>"; };
@@ -587,6 +589,7 @@
 				0172785F2D7D83E700CE424F /* ItemTagState.swift */,
 				017278602D7D83E700CE424F /* ItemTagType.swift */,
 				01B526532AF4E36400655131 /* MainTab.swift */,
+				2FE8A6D1D27C458389C4F61A /* PaginationMeta.swift */,
 				017278082D7D4F7400CE424F /* Onboarding.swift */,
 				017278672D7D83F600CE424F /* ScanState.swift */,
 				01B526552AF4E82A00655131 /* ScrollToTopID.swift */,
@@ -1053,6 +1056,7 @@
 				0199CD252E07510200109DC6 /* ItemTagRepositoryProtocol.swift in Sources */,
 				0199CD262E07510200109DC6 /* ShopRepositoryProtocol.swift in Sources */,
 				017278632D7D83E700CE424F /* ItemTagState.swift in Sources */,
+				4A8DA0DEF6F142C3A127058A /* PaginationMeta.swift in Sources */,
 				017278642D7D83E700CE424F /* ItemTagInfoFromNdefMessage.swift in Sources */,
 				017278652D7D83E700CE424F /* ItemTagType.swift in Sources */,
 				0172046625AA82BF008FD63B /* MessageBarView.swift in Sources */,
diff --git a/NativeAppTemplate/Data/Repositories/ItemTagRepository.swift b/NativeAppTemplate/Data/Repositories/ItemTagRepository.swift
@@ -10,6 +10,8 @@ import SwiftUI
 
     var itemTags: [ItemTag] = []
     var state: DataState = .initial
+    var paginationMeta: PaginationMeta?
+    var isLoadingMore = false
 
     required init(itemTagsService: ItemTagsService) {
         self.itemTagsService = itemTagsService
@@ -37,7 +39,9 @@ import SwiftUI
 
         Task { @MainActor in
             do {
-                itemTags = try await itemTagsService.allItemTags(shopId: shopId)
+                let response = try await itemTagsService.allItemTags(shopId: shopId)
+                itemTags = response.itemTags
+                paginationMeta = response.paginationMeta
                 state = .hasData
             } catch {
                 state = .failed
@@ -48,9 +52,60 @@ import SwiftUI
         }
     }
 
+    func reloadPage(shopId: String, page: Int) {
+        if Task.isCancelled {
+            return
+        }
+
+        if state == .loading {
+            return
+        }
+
+        state = .loading
+
+        Task { @MainActor in
+            do {
+                let response = try await itemTagsService.allItemTags(shopId: shopId, page: page)
+                itemTags = response.itemTags
+                paginationMeta = response.paginationMeta
+                state = .hasData
+            } catch {
+                state = .failed
+                Failure
+                    .fetch(from: Self.self, reason: error.codedDescription)
+                    .log()
+            }
+        }
+    }
+
+    func loadNextPage(shopId: String) {
+        guard let meta = paginationMeta, meta.hasMorePages else { return }
+
+        if isLoadingMore {
+            return
+        }
+
+        isLoadingMore = true
+
+        Task { @MainActor in
+            do {
+                let response = try await itemTagsService.allItemTags(shopId: shopId, page: meta.currentPage + 1)
+                itemTags.append(contentsOf: response.itemTags)
+                paginationMeta = response.paginationMeta
+            } catch {
+                Failure
+                    .fetch(from: Self.self, reason: error.codedDescription)
+                    .log()
+            }
+
+            isLoadingMore = false
+        }
+    }
+
     func fetchAll(shopId: String) async throws -> [ItemTag] {
         do {
-            itemTags = try await itemTagsService.allItemTags(shopId: shopId)
+            let response = try await itemTagsService.allItemTags(shopId: shopId)
+            itemTags = response.itemTags
             return itemTags
         } catch {
             Failure
diff --git a/NativeAppTemplate/Data/Repositories/ItemTagRepositoryProtocol.swift b/NativeAppTemplate/Data/Repositories/ItemTagRepositoryProtocol.swift
@@ -9,11 +9,15 @@ import SwiftUI
     var itemTags: [ItemTag] { get set }
     var state: DataState { get set }
     var isEmpty: Bool { get }
+    var paginationMeta: PaginationMeta? { get }
+    var isLoadingMore: Bool { get }
 
     init(itemTagsService: ItemTagsService)
 
     func findBy(id: String) -> ItemTag
     func reload(shopId: String)
+    func reloadPage(shopId: String, page: Int)
+    func loadNextPage(shopId: String)
     func fetchAll(shopId: String) async throws -> [ItemTag]
     func fetchDetail(id: String) async throws -> ItemTag
     func create(shopId: String, itemTag: ItemTag) async throws -> ItemTag
diff --git a/NativeAppTemplate/Models/PaginationMeta.swift b/NativeAppTemplate/Models/PaginationMeta.swift
@@ -0,0 +1,38 @@
+//
+//  PaginationMeta.swift
+//  NativeAppTemplate
+//
+
+import Foundation
+
+struct PaginationMeta: Sendable {
+    let currentPage: Int
+    let totalPages: Int
+    let totalCount: Int
+    let limit: Int
+
+    var hasMorePages: Bool {
+        currentPage < totalPages
+    }
+
+    init(currentPage: Int, totalPages: Int, totalCount: Int, limit: Int) {
+        self.currentPage = currentPage
+        self.totalPages = totalPages
+        self.totalCount = totalCount
+        self.limit = limit
+    }
+
+    init?(dictionary: [String: Any]) {
+        guard let currentPage = dictionary["current_page"] as? Int,
+              let totalPages = dictionary["total_pages"] as? Int,
+              let totalCount = dictionary["total_count"] as? Int,
+              let limit = dictionary["limit"] as? Int else {
+            return nil
+        }
+
+        self.currentPage = currentPage
+        self.totalPages = totalPages
+        self.totalCount = totalCount
+        self.limit = limit
+    }
+}
diff --git a/NativeAppTemplate/Networking/Requests/ItemTagsRequest.swift b/NativeAppTemplate/Networking/Requests/ItemTagsRequest.swift
@@ -5,8 +5,13 @@
 
 import Foundation
 
+struct ItemTagsResponse: Sendable {
+    let itemTags: [ItemTag]
+    let paginationMeta: PaginationMeta?
+}
+
 struct GetItemTagsRequest: Request {
-    typealias Response = [ItemTag]
+    typealias Response = ItemTagsResponse
 
     // MARK: - Properties
 
@@ -19,18 +24,27 @@ struct GetItemTagsRequest: Request {
     }
 
     var additionalHeaders: [String: String] = [:]
+
+    var queryItems: [URLQueryItem] {
+        guard let page else { return [] }
+        return [URLQueryItem(name: "page", value: String(page))]
+    }
+
     var body: Data? {
         nil
     }
 
     let shopId: String
+    let page: Int?
 
     // MARK: - Internal
 
     func handle(response: Data) throws -> Response {
         let json = try JSONSerialization.jsonObject(with: response)
         let doc = JSONAPIDocument(json)
-        return try doc.data.map { try ItemTagAdapter.process(resource: $0) }
+        let itemTags = try doc.data.map { try ItemTagAdapter.process(resource: $0) }
+        let paginationMeta = PaginationMeta(dictionary: doc.meta)
+        return ItemTagsResponse(itemTags: itemTags, paginationMeta: paginationMeta)
     }
 }
 
diff --git a/NativeAppTemplate/Networking/Requests/Request.swift b/NativeAppTemplate/Networking/Requests/Request.swift
@@ -3,7 +3,7 @@
 //  NativeAppTemplate
 //
 
-import struct Foundation.Data
+import Foundation
 
 enum HTTPMethod: String {
     case GET
@@ -19,6 +19,7 @@ protocol Request {
     var method: HTTPMethod { get }
     var path: String { get }
     var additionalHeaders: [String: String] { get }
+    var queryItems: [URLQueryItem] { get }
     var body: Data? { get }
 
     func handle(response: Data) throws -> Response
@@ -30,6 +31,10 @@ extension Request {
         .GET
     }
 
+    var queryItems: [URLQueryItem] {
+        []
+    }
+
     var body: Data? {
         nil
     }
diff --git a/NativeAppTemplate/Networking/Services/ItemTagsService.swift b/NativeAppTemplate/Networking/Services/ItemTagsService.swift
@@ -10,8 +10,8 @@ struct ItemTagsService: Service {
 extension ItemTagsService {
     // MARK: - Internal
 
-    func allItemTags(shopId: String) async throws -> GetItemTagsRequest.Response {
-        let request = GetItemTagsRequest(shopId: shopId)
+    func allItemTags(shopId: String, page: Int? = nil) async throws -> GetItemTagsRequest.Response {
+        let request = GetItemTagsRequest(shopId: shopId, page: page)
         return try await makeRequest(request: request)
     }
 
diff --git a/NativeAppTemplate/Networking/Services/Service.swift b/NativeAppTemplate/Networking/Services/Service.swift
@@ -31,13 +31,17 @@ extension Service {
             pathURL = pathURL.appendingPathComponent(networkClient.environment.basePath)
             pathURL = pathURL.appendingPathComponent(request.path)
 
-            guard let components = URLComponents(
+            guard var components = URLComponents(
                 url: pathURL,
                 resolvingAgainstBaseURL: false
             ) else {
                 throw URLError(.badURL)
             }
 
+            if !request.queryItems.isEmpty {
+                components.queryItems = request.queryItems
+            }
+
             guard let url = components.url
             else { throw URLError(.badURL) }
 
diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListView.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListView.swift
@@ -55,24 +55,30 @@ private extension ItemTagListView {
             if viewModel.isEmpty {
                 noResultsView
             } else {
-                List(viewModel.itemTags) { itemTag in
-                    NavigationLink(
-                        destination: ItemTagDetailView(
-                            viewModel: viewModel.createItemTagDetailViewModel(itemTagId: itemTag.id)
-                        )
-                    ) {
-                        ItemTagListCardView(
-                            itemTag: itemTag
-                        )
-                        .swipeActions(edge: .trailing, allowsFullSwipe: false) {
-                            Button(role: .destructive) { viewModel.destroyItemTag(itemTagId: itemTag.id) } label: {
-                                Label(String.delete, systemImage: "trash")
-                                    .labelStyle(.titleOnly)
+                List {
+                    ForEach(viewModel.itemTags) { itemTag in
+                        NavigationLink(
+                            destination: ItemTagDetailView(
+                                viewModel: viewModel.createItemTagDetailViewModel(itemTagId: itemTag.id)
+                            )
+                        ) {
+                            ItemTagListCardView(
+                                itemTag: itemTag
+                            )
+                            .swipeActions(edge: .trailing, allowsFullSwipe: false) {
+                                Button(role: .destructive) { viewModel.destroyItemTag(itemTagId: itemTag.id) } label: {
+                                    Label(String.delete, systemImage: "trash")
+                                        .labelStyle(.titleOnly)
+                                }
+                                .tint(.validationError)
                             }
-                            .tint(.validationError)
                         }
+                        .listRowBackground(Color.cardBackground.opacity(0.7))
+                    }
+
+                    if viewModel.hasMorePages {
+                        loadMoreRow
                     }
-                    .listRowBackground(Color.cardBackground.opacity(0.7))
                 }
                 .refreshable {
                     viewModel.reload()
@@ -102,6 +108,19 @@ private extension ItemTagListView {
         )
     }
 
+    var loadMoreRow: some View {
+        HStack {
+            Spacer()
+            ProgressView()
+                .padding(NativeAppTemplateConstants.Spacing.xxs)
+            Spacer()
+        }
+        .listRowBackground(Color.clear)
+        .onAppear {
+            viewModel.loadMore()
+        }
+    }
+
     var noResultsView: some View {
         VStack {
             Image(systemName: "01.square")
diff --git a/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListViewModel.swift b/NativeAppTemplate/UI/Shop Settings/ItemTag List/ItemTagListViewModel.swift
@@ -20,6 +20,18 @@ final class ItemTagListViewModel {
         itemTagRepository.itemTags
     }
 
+    var paginationMeta: PaginationMeta? {
+        itemTagRepository.paginationMeta
+    }
+
+    var isLoadingMore: Bool {
+        itemTagRepository.isLoadingMore
+    }
+
+    var hasMorePages: Bool {
+        paginationMeta?.hasMorePages ?? false
+    }
+
     private let itemTagRepository: ItemTagRepositoryProtocol
     private let messageBus: MessageBus
     private let sessionController: SessionControllerProtocol
@@ -46,7 +58,11 @@ final class ItemTagListViewModel {
     }
 
     func reload() {
-        itemTagRepository.reload(shopId: shop.id)
+        itemTagRepository.reloadPage(shopId: shop.id, page: 1)
+    }
+
+    func loadMore() {
+        itemTagRepository.loadNextPage(shopId: shop.id)
     }
 
     func destroyItemTag(itemTagId: String) {
diff --git a/NativeAppTemplateTests/Demo/Data/Repositories/DemoItemTagRepository.swift b/NativeAppTemplateTests/Demo/Data/Repositories/DemoItemTagRepository.swift
@@ -15,6 +15,9 @@ final class DemoItemTagRepository: ItemTagRepositoryProtocol {
         itemTags.isEmpty
     }
 
+    var paginationMeta: PaginationMeta?
+    var isLoadingMore = false
+
     required init(itemTagsService: ItemTagsService) {}
 
     func findBy(id: String) -> ItemTag {
@@ -30,6 +33,14 @@ final class DemoItemTagRepository: ItemTagRepositoryProtocol {
         state = .hasData
     }
 
+    func reloadPage(shopId: String, page: Int) {
+        reload(shopId: shopId)
+    }
+
+    func loadNextPage(shopId: String) {
+        // No-op for demo
+    }
+
     func fetchAll(shopId: String) async throws -> [ItemTag] {
         let allItemTags = fetchAll()
         return allItemTags.filter { $0.shopId == shopId }
diff --git a/NativeAppTemplateTests/Models/PaginationMetaTest.swift b/NativeAppTemplateTests/Models/PaginationMetaTest.swift
diff --git a/NativeAppTemplateTests/Testing/Repositories/TestItemTagRepository.swift b/NativeAppTemplateTests/Testing/Repositories/TestItemTagRepository.swift
diff --git a/NativeAppTemplateTests/UI/Shop Settings/ItemTag List/ItemTagListViewModelTest.swift b/NativeAppTemplateTests/UI/Shop Settings/ItemTag List/ItemTagListViewModelTest.swift
diff --git a/doc/pagination-item-tags.md b/doc/pagination-item-tags.md

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ struct ItemTagsService: Service {`
`10`	`10`	`extension ItemTagsService {`
`11`	`11`	`// MARK: - Internal`
`12`	`12`
`13`		`- func allItemTags(shopId: String) async throws -> GetItemTagsRequest.Response {`
`14`		`- let request = GetItemTagsRequest(shopId: shopId)`
	`13`	`+ func allItemTags(shopId: String, page: Int? = nil) async throws -> GetItemTagsRequest.Response {`
	`14`	`+ let request = GetItemTagsRequest(shopId: shopId, page: page)`
`15`	`15`	`return try await makeRequest(request: request)`
`16`	`16`	`}`
`17`	`17`