julian/superport_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(approvals): Approval Flow v2 프런트엔드 전면 개편

Browse Source 
- 환경/라우터 모듈에 approval_flow_v2 토글을 추가하고 FeatureFlags 초기화를 연결 (.env*, lib/core/**)
- ApiClient 빌더·ApiRoutes 확장과 ApprovalRepositoryRemote 리팩터링으로 include·액션 시그니처를 정합화
- ApprovalFlow·ApprovalDraft 엔티티/레포/유즈케이스를 도입해 서버 초안과 단계 액션(승인·회수·재상신)을 지원
- Approval 컨트롤러·히스토리·템플릿 페이지와 공유 위젯을 재작성해 감사 로그·회수 UX·템플릿 CRUD를 반영
- Inbound/Outbound/Rental 컨트롤러·페이지에 결재 섹션을 삽입하고 대시보드 pending 카드 요약을 갱신
- SuperportDialog·FormField 등 공통 위젯을 보강하고 승인 위젯 가이드를 추가해 UI 가이드를 정리
- 결재/재고 테스트 픽스처와 단위·위젯·통합 테스트를 확장하고 flutter_test_config로 스테이징 호스트를 허용
- Approval Flow 레포트/플랜 문서를 업데이트하고 ApprovalFlow_System_Integration_and_ChangePlan.md를 추가
- 실행: flutter analyze, flutter test
This commit is contained in:
JiWoong Sul
2025-10-31 01:05:39 +09:00
parent 259b056072
commit d76f765814
133 changed files with 13878 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/features/inventory/rental/domain/entities/create_rental_request_input.dart Normal file
View File

@@ -0,0 +1,46 @@
import '../../../transactions/domain/entities/stock_transaction_input.dart';
/// 대여 생성 요청 입력 값.
///
/// - 대여 반납 예정일과 결재 구성을 포함한다.
class CreateRentalRequestInput {
CreateRentalRequestInput({
required this.transactionTypeId,
required this.transactionStatusId,
required this.warehouseId,
required this.transactionDate,
required this.createdById,
required this.approval,
this.expectedReturnDate,
this.note,
this.lines = const [],
this.customers = const [],
});
final int transactionTypeId;
final int transactionStatusId;
final int warehouseId;
final DateTime transactionDate;
final int createdById;
final DateTime? expectedReturnDate;
final String? note;
final List<TransactionLineCreateInput> lines;
final List<TransactionCustomerCreateInput> customers;
final StockTransactionApprovalInput approval;
/// 재고 트랜잭션 입력 모델로 변환한다.
StockTransactionCreateInput toTransactionInput() {
return StockTransactionCreateInput(
transactionTypeId: transactionTypeId,
transactionStatusId: transactionStatusId,
warehouseId: warehouseId,
transactionDate: transactionDate,
createdById: createdById,
note: note,
expectedReturnDate: expectedReturnDate,
lines: lines,
customers: customers,
approval: approval,
);
}
}

153
lib/features/inventory/rental/presentation/controllers/rental_controller.dart
View File

@@ -1,8 +1,13 @@
import 'dart:async';
import 'dart:collection';
import 'package:flutter/foundation.dart';
import 'package:superport_v2/core/common/models/paginated_result.dart';
import 'package:superport_v2/core/network/failure.dart';
import 'package:superport_v2/features/approvals/domain/entities/approval_draft.dart';
import 'package:superport_v2/features/approvals/domain/usecases/get_approval_draft_use_case.dart';
import 'package:superport_v2/features/approvals/domain/usecases/list_approval_drafts_use_case.dart';
import 'package:superport_v2/features/approvals/domain/usecases/save_approval_draft_use_case.dart';
import 'package:superport_v2/features/inventory/lookups/domain/entities/lookup_item.dart';
import 'package:superport_v2/features/inventory/lookups/domain/repositories/inventory_lookup_repository.dart';
import 'package:superport_v2/features/inventory/rental/presentation/models/rental_record.dart';
@@ -21,10 +26,16 @@ class RentalController extends ChangeNotifier {
List<String> fallbackStatusOptions = const ['대여중', '반납대기', '완료'],
List<String> rentTransactionKeywords = const ['대여', 'rent'],
List<String> returnTransactionKeywords = const ['반납', 'return'],
SaveApprovalDraftUseCase? saveDraftUseCase,
GetApprovalDraftUseCase? getDraftUseCase,
ListApprovalDraftsUseCase? listDraftsUseCase,
}) : _transactionRepository = transactionRepository,
_lineRepository = lineRepository,
_customerRepository = customerRepository,
_lookupRepository = lookupRepository,
_saveDraftUseCase = saveDraftUseCase,
_getDraftUseCase = getDraftUseCase,
_listDraftsUseCase = listDraftsUseCase,
_fallbackStatusOptions = List<String>.unmodifiable(
fallbackStatusOptions,
),
@@ -41,6 +52,9 @@ class RentalController extends ChangeNotifier {
final TransactionLineRepository _lineRepository;
final TransactionCustomerRepository _customerRepository;
final InventoryLookupRepository _lookupRepository;
final SaveApprovalDraftUseCase? _saveDraftUseCase;
final GetApprovalDraftUseCase? _getDraftUseCase;
final ListApprovalDraftsUseCase? _listDraftsUseCase;
final List<String> _fallbackStatusOptions;
final List<String> _rentTransactionKeywords;
final List<String> _returnTransactionKeywords;
@@ -56,6 +70,7 @@ class RentalController extends ChangeNotifier {
StockTransactionListFilter? _lastFilter;
final Set<int> _processingTransactionIds = <int>{};
bool _lastFilterByRentalTypes = true;
StockTransactionApprovalInput? _approvalDraft;
UnmodifiableListView<String> get statusOptions =>
UnmodifiableListView(_statusOptions);
@@ -84,6 +99,7 @@ class RentalController extends ChangeNotifier {
UnmodifiableSetView(_processingTransactionIds);
bool get lastFilterByRentalTypes => _lastFilterByRentalTypes;
StockTransactionApprovalInput? get approvalDraft => _approvalDraft;
/// 트랜잭션 상태 목록을 조회한다.
Future<void> loadStatusOptions() async {
@@ -132,6 +148,64 @@ class RentalController extends ChangeNotifier {
}
}
/// 결재 구성 초안 상태를 갱신한다.
void updateApprovalDraft(StockTransactionApprovalInput approval) {
_approvalDraft = approval;
notifyListeners();
_persistApprovalDraft(approval);
}
/// 결재 구성 초안을 초기화한다.
void clearApprovalDraft() {
if (_approvalDraft == null) {
return;
}
_approvalDraft = null;
notifyListeners();
}
Future<void> loadApprovalDraftFromServer({
required int requesterId,
int? transactionId,
}) async {
final listUseCase = _listDraftsUseCase;
final getUseCase = _getDraftUseCase;
if (listUseCase == null || getUseCase == null) {
return;
}
try {
final result = await listUseCase.call(
ApprovalDraftListFilter(
requesterId: requesterId,
transactionId: transactionId,
pageSize: 10,
),
);
if (result.items.isEmpty) {
return;
}
final sessionKey = _draftSessionKey(
requesterId,
transactionId: transactionId,
);
final summary = result.items.firstWhere(
(item) => item.sessionKey == sessionKey,
orElse: () => result.items.first,
);
final detail = await getUseCase.call(
id: summary.id,
requesterId: requesterId,
);
if (detail == null) {
return;
}
_approvalDraft = _toTransactionApproval(detail);
notifyListeners();
} catch (error, stackTrace) {
debugPrint('[RentalController] 초안 복구 실패: $error\n$stackTrace');
}
}
/// 필터 조건에 맞는 대여/반납 트랜잭션을 조회한다.
Future<void> fetchTransactions({
required StockTransactionListFilter filter,
@@ -188,6 +262,84 @@ class RentalController extends ChangeNotifier {
);
}
void _persistApprovalDraft(StockTransactionApprovalInput approval) {
final useCase = _saveDraftUseCase;
if (useCase == null) {
return;
}
if (approval.steps.isEmpty) {
return;
}
final input = _buildApprovalDraftSaveInput(approval);
if (!input.hasSteps) {
return;
}
unawaited(
Future<void>(() async {
try {
await useCase.call(input);
} catch (error, stackTrace) {
debugPrint('[RentalController] 초안 저장 실패: $error\n$stackTrace');
}
}),
);
}
ApprovalDraftSaveInput _buildApprovalDraftSaveInput(
StockTransactionApprovalInput approval,
) {
final steps = approval.steps
.map(
(step) => ApprovalDraftStep(
stepOrder: step.stepOrder,
approverId: step.approverId,
note: step.note,
),
)
.toList(growable: false);
return ApprovalDraftSaveInput(
requesterId: approval.requestedById,
transactionId: null,
templateId: approval.templateId,
title: approval.title,
summary: approval.summary,
note: approval.note,
metadata: approval.metadata,
sessionKey: _draftSessionKey(approval.requestedById),
statusId: approval.approvalStatusId,
steps: steps,
);
}
String _draftSessionKey(int requesterId, {int? transactionId}) {
final base = 'inventory_rental_$requesterId';
if (transactionId == null) {
return base;
}
return '${base}_$transactionId';
}
StockTransactionApprovalInput _toTransactionApproval(
ApprovalDraftDetail detail,
) {
final submission = detail.toSubmissionInput(defaultStatusId: null);
return StockTransactionApprovalInput(
requestedById: submission.requesterId,
approvalStatusId: submission.statusId == 0 ? null : submission.statusId,
templateId: submission.templateId,
finalApproverId: submission.finalApproverId,
requestedAt: submission.requestedAt,
decidedAt: submission.decidedAt,
cancelledAt: submission.cancelledAt,
lastActionAt: submission.lastActionAt,
title: submission.title,
summary: submission.summary,
note: submission.note,
metadata: submission.metadata,
steps: submission.steps,
);
}
/// 대여/반납 트랜잭션을 생성한다.
Future<RentalRecord> createTransaction(
StockTransactionCreateInput input, {
@@ -195,6 +347,7 @@ class RentalController extends ChangeNotifier {
StockTransactionListFilter? refreshFilter,
bool? refreshFilterByRentalTypes,
}) {
_approvalDraft = input.approval;
return _executeMutation(
() => _transactionRepository.create(input),
refreshAfter: refreshAfter,

102
lib/features/inventory/rental/presentation/pages/rental_page.dart
View File

@@ -17,6 +17,13 @@ import 'package:superport_v2/features/inventory/shared/widgets/product_autocompl
import 'package:superport_v2/features/inventory/shared/widgets/employee_autocomplete_field.dart';
import 'package:superport_v2/features/inventory/shared/widgets/customer_multi_select_field.dart';
import 'package:superport_v2/features/inventory/shared/widgets/warehouse_select_field.dart';
import 'package:superport_v2/features/approvals/request/presentation/controllers/approval_request_controller.dart';
import 'package:superport_v2/features/approvals/request/presentation/utils/approval_form_initializer.dart';
import 'package:superport_v2/features/approvals/request/presentation/widgets/approval_step_configurator.dart';
import 'package:superport_v2/features/approvals/request/presentation/widgets/approval_template_picker.dart';
import 'package:superport_v2/features/approvals/domain/usecases/get_approval_draft_use_case.dart';
import 'package:superport_v2/features/approvals/domain/usecases/list_approval_drafts_use_case.dart';
import 'package:superport_v2/features/approvals/domain/usecases/save_approval_draft_use_case.dart';
import 'package:superport_v2/core/config/environment.dart';
import 'package:superport_v2/core/network/failure.dart';
import 'package:superport_v2/core/permissions/permission_manager.dart';
@@ -29,6 +36,7 @@ import 'package:superport_v2/features/inventory/transactions/domain/entities/sto
import 'package:superport_v2/features/inventory/transactions/domain/repositories/stock_transaction_repository.dart';
import 'package:superport_v2/features/inventory/transactions/presentation/services/transaction_detail_sync_service.dart';
import 'package:superport_v2/features/inventory/transactions/presentation/widgets/transaction_detail_dialog.dart';
import 'package:superport_v2/features/auth/application/auth_service.dart';
import '../../../lookups/domain/entities/lookup_item.dart';
import '../../../lookups/domain/repositories/inventory_lookup_repository.dart';
import '../widgets/rental_detail_view.dart';
@@ -130,6 +138,15 @@ class _RentalPageState extends State<RentalPage> {
fallbackStatusOptions: RentalTableSpec.fallbackStatusOptions,
rentTransactionKeywords: RentalTableSpec.rentTransactionKeywords,
returnTransactionKeywords: RentalTableSpec.returnTransactionKeywords,
saveDraftUseCase: getIt.isRegistered<SaveApprovalDraftUseCase>()
? getIt<SaveApprovalDraftUseCase>()
: null,
getDraftUseCase: getIt.isRegistered<GetApprovalDraftUseCase>()
? getIt<GetApprovalDraftUseCase>()
: null,
listDraftsUseCase: getIt.isRegistered<ListApprovalDraftsUseCase>()
? getIt<ListApprovalDraftsUseCase>()
: null,
);
}
@@ -140,6 +157,10 @@ class _RentalPageState extends State<RentalPage> {
}
Future.microtask(() async {
await controller.loadStatusOptions();
final requester = _resolveCurrentWriter();
if (requester != null) {
await controller.loadApprovalDraftFromServer(requesterId: requester.id);
}
final hasTypes = await controller.resolveTransactionTypes();
if (!mounted) {
return;
@@ -219,6 +240,26 @@ class _RentalPageState extends State<RentalPage> {
}
}
InventoryEmployeeSuggestion? _resolveCurrentWriter() {
final getIt = GetIt.I;
if (!getIt.isRegistered<AuthService>()) {
return null;
}
final session = getIt<AuthService>().session;
final user = session?.user;
if (user == null) {
return null;
}
final employeeNo = (user.employeeNo ?? '').trim().isEmpty
? user.id.toString()
: user.employeeNo!.trim();
return InventoryEmployeeSuggestion(
id: user.id,
employeeNo: employeeNo,
name: user.name,
);
}
@override
void didUpdateWidget(covariant RentalPage oldWidget) {
super.didUpdateWidget(oldWidget);
@@ -1538,6 +1579,25 @@ class _RentalPageState extends State<RentalPage> {
return '${suggestion.name} (${suggestion.employeeNo})';
}
final approvalController = ApprovalRequestController();
final defaultRequester = () {
final writer = writerSelection;
if (writer == null) {
return null;
}
return ApprovalRequestParticipant(
id: writer.id,
name: writer.name,
employeeNo: writer.employeeNo,
);
}();
ApprovalFormInitializer.populate(
controller: approvalController,
existingApproval: initial?.raw?.approval,
draft: _controller?.approvalDraft,
defaultRequester: defaultRequester,
);
final writerController = TextEditingController(
text: writerLabel(writerSelection),
);
@@ -1792,6 +1852,23 @@ class _RentalPageState extends State<RentalPage> {
)
.toList(growable: false);
StockTransactionApprovalInput approvalInput;
try {
approvalInput = approvalController.buildTransactionApprovalInput(
approvalStatusId: null,
note: approvalNoteValue.isEmpty ? null : approvalNoteValue,
);
} on StateError catch (error) {
updateSaving(false);
SuperportToast.error(context, error.message);
return;
} catch (_) {
updateSaving(false);
SuperportToast.error(context, '결재 구성을 확인하고 다시 시도하세요.');
return;
}
controller.updateApprovalDraft(approvalInput);
final transactionTypeId = selectedLookup.id;
final created = await controller.createTransaction(
StockTransactionCreateInput(
@@ -1804,10 +1881,7 @@ class _RentalPageState extends State<RentalPage> {
expectedReturnDate: returnDue.value,
lines: createLines,
customers: createCustomers,
approval: StockTransactionApprovalInput(
requestedById: createdById,
note: approvalNoteValue.isEmpty ? null : approvalNoteValue,
),
approval: approvalInput,
),
);
result = created;
@@ -2093,6 +2167,15 @@ class _RentalPageState extends State<RentalPage> {
enabled: initial == null,
onSuggestionSelected: (suggestion) {
writerSelection = suggestion;
approvalController.setRequester(
suggestion == null
? null
: ApprovalRequestParticipant(
id: suggestion.id,
name: suggestion.name,
employeeNo: suggestion.employeeNo,
),
);
if (writerError != null) {
setState(() {
writerError = null;
@@ -2109,6 +2192,7 @@ class _RentalPageState extends State<RentalPage> {
if (currentText.isEmpty ||
currentText != selectedLabel) {
writerSelection = null;
approvalController.setRequester(null);
}
if (writerError != null) {
setState(() {
@@ -2154,6 +2238,15 @@ class _RentalPageState extends State<RentalPage> {
),
],
),
const SizedBox(height: 16),
if (initial == null) ...[
ApprovalTemplatePicker(controller: approvalController),
const SizedBox(height: 16),
],
ApprovalStepConfigurator(
controller: approvalController,
readOnly: initial != null,
),
const SizedBox(height: 24),
Wrap(
spacing: 12,
@@ -2274,6 +2367,7 @@ class _RentalPageState extends State<RentalPage> {
approvalNoteController.dispose();
processedAt.dispose();
returnDue.dispose();
approvalController.dispose();
return result;
}

23
lib/features/inventory/rental/presentation/widgets/rental_detail_view.dart
View File

@@ -27,10 +27,7 @@ class RentalDetailView extends StatelessWidget {
children: [
if (!transitionsEnabled) ...[
ShadBadge.outline(
child: Text(
'재고 상태 전이가 비활성화된 상태입니다.',
style: theme.textTheme.small,
),
child: Text('재고 상태 전이가 비활성화된 상태입니다.', style: theme.textTheme.small),
),
const SizedBox(height: 16),
],
@@ -73,8 +70,10 @@ class RentalDetailView extends StatelessWidget {
for (final customer in record.customers)
ShadBadge(
child: Padding(
padding:
const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
padding: const EdgeInsets.symmetric(
horizontal: 10,
vertical: 6,
),
child: Text('${customer.name} · ${customer.code}'),
),
),
@@ -108,9 +107,7 @@ class RentalDetailView extends StatelessWidget {
ShadTableCell(child: Text(item.manufacturer)),
ShadTableCell(child: Text(item.unit)),
ShadTableCell(child: Text('${item.quantity}')),
ShadTableCell(
child: Text(currencyFormatter.format(item.price)),
),
ShadTableCell(child: Text(currencyFormatter.format(item.price))),
ShadTableCell(
child: Text(item.remark.isEmpty ? '-' : item.remark),
),
@@ -143,13 +140,13 @@ class _DetailChip extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(label, style: theme.textTheme.small, textAlign: TextAlign.center),
const SizedBox(height: 4),
Text(
value,
style: theme.textTheme.p,
label,
style: theme.textTheme.small,
textAlign: TextAlign.center,
),
const SizedBox(height: 4),
Text(value, style: theme.textTheme.p, textAlign: TextAlign.center),
],
),
);