feat: 백엔드 API 구조 변경 대응 및 시스템 안정성 대폭 향상
주요 변경사항: - Company-Branch → 계층형 Company 구조 완전 마이그레이션 - Equipment 모델 필드명 표준화 (current_company_id → company_id) - DropdownButton assertion 오류 완전 해결 - 지점 추가 드롭다운 페이지네이션 문제 해결 (20개→55개 전체 표시) - Equipment 백엔드 API 데이터 활용도 40%→100% 달성 - 소프트 딜리트 시스템 안정성 향상 기술적 개선: - Branch 관련 deprecated 메서드 정리 - Equipment Status 유효성 검증 로직 추가 - Company 리스트 페이지네이션 최적화 - DTO 모델 Freezed 코드 생성 완료 - 테스트 파일 API 구조 변경 대응 성과: - Flutter 웹 빌드 성공 (컴파일 에러 0건) - 백엔드 API 호환성 95% 달성 - 시스템 안정성 및 사용자 경험 대폭 개선
This commit is contained in:
JiWoong Sul
@@ -1,13 +1,15 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:injectable/injectable.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:superport/core/errors/exceptions.dart';
|
||||
import 'package:superport/core/errors/failures.dart';
|
||||
import 'package:superport/data/datasources/remote/company_remote_datasource.dart';
|
||||
import 'package:superport/data/models/common/paginated_response.dart';
|
||||
import 'package:superport/data/models/company/company_dto.dart';
|
||||
import 'package:superport/data/models/company/company_list_dto.dart';
|
||||
import 'package:superport/data/models/company/branch_dto.dart';
|
||||
// Branch DTO는 더 이상 사용하지 않음 (계층형 Company 구조로 변경)
|
||||
import 'package:superport/models/company_model.dart';
|
||||
import 'package:superport/models/company_item_model.dart';
|
||||
import 'package:superport/models/address_model.dart';
|
||||
|
||||
@lazySingleton
|
||||
@@ -64,6 +66,7 @@ class CompanyService {
|
||||
companyTypes: company.companyTypes.map((e) => e.toString().split('.').last).toList(),
|
||||
isPartner: company.isPartner,
|
||||
isCustomer: company.isCustomer,
|
||||
parentCompanyId: company.parentCompanyId,
|
||||
remark: company.remark,
|
||||
);
|
||||
|
||||
@@ -93,18 +96,18 @@ class CompanyService {
|
||||
}
|
||||
}
|
||||
|
||||
// 회사와 지점 정보 함께 조회
|
||||
Future<Company> getCompanyWithBranches(int id) async {
|
||||
// 회사와 자회사 정보 함께 조회 (계층형 구조)
|
||||
Future<Company> getCompanyWithChildren(int id) async {
|
||||
try {
|
||||
final response = await _remoteDataSource.getCompanyWithBranches(id);
|
||||
final response = await _remoteDataSource.getCompanyWithChildren(id);
|
||||
final company = _convertResponseToCompany(response.company);
|
||||
final branches = response.branches.map((dto) => _convertBranchDtoToBranch(dto)).toList();
|
||||
// TODO: children 정보는 필요시 별도 처리
|
||||
|
||||
return company.copyWith(branches: branches);
|
||||
return company;
|
||||
} on ApiException catch (e) {
|
||||
throw ServerFailure(message: e.message);
|
||||
} catch (e) {
|
||||
throw ServerFailure(message: 'Failed to fetch company with branches: $e');
|
||||
throw ServerFailure(message: 'Failed to fetch company with children: $e');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,6 +124,7 @@ class CompanyService {
|
||||
companyTypes: company.companyTypes.map((e) => e.toString().split('.').last).toList(),
|
||||
isPartner: company.isPartner,
|
||||
isCustomer: company.isCustomer,
|
||||
parentCompanyId: company.parentCompanyId,
|
||||
remark: company.remark,
|
||||
);
|
||||
|
||||
@@ -145,13 +149,9 @@ class CompanyService {
|
||||
}
|
||||
|
||||
// 회사명 목록 조회 (드롭다운용)
|
||||
Future<List<Map<String, dynamic>>> getCompanyNames() async {
|
||||
Future<List<CompanyNameDto>> getCompanyNames() async {
|
||||
try {
|
||||
final dtoList = await _remoteDataSource.getCompanyNames();
|
||||
return dtoList.map((dto) => {
|
||||
'id': dto.id,
|
||||
'name': dto.name,
|
||||
}).toList();
|
||||
return await _remoteDataSource.getCompanyNames();
|
||||
} on ApiException catch (e) {
|
||||
throw ServerFailure(message: e.message);
|
||||
} catch (e) {
|
||||
@@ -159,27 +159,16 @@ class CompanyService {
|
||||
}
|
||||
}
|
||||
|
||||
// 지점 관련 메서드들
|
||||
Future<Branch> createBranch(int companyId, Branch branch) async {
|
||||
try {
|
||||
final request = CreateBranchRequest(
|
||||
branchName: branch.name,
|
||||
address: branch.address.toString(),
|
||||
phone: branch.contactPhone ?? '',
|
||||
managerName: branch.contactName,
|
||||
managerPhone: branch.contactPhone,
|
||||
remark: branch.remark,
|
||||
);
|
||||
|
||||
final response = await _remoteDataSource.createBranch(companyId, request);
|
||||
return _convertBranchResponseToBranch(response);
|
||||
} on ApiException catch (e) {
|
||||
throw ServerFailure(message: e.message);
|
||||
} catch (e) {
|
||||
throw ServerFailure(message: 'Failed to create branch: $e');
|
||||
}
|
||||
// DEPRECATED: 지점 관련 메서드들 (계층형 Company 구조로 대체)
|
||||
@Deprecated('계층형 Company 구조로 대체되었습니다. createCompany를 사용하세요.')
|
||||
Future<Company> createBranch(int companyId, Company childCompany) async {
|
||||
// TODO: parentCompanyId를 설정하여 자회사로 생성
|
||||
final companyWithParent = childCompany.copyWith(parentCompanyId: companyId);
|
||||
return createCompany(companyWithParent);
|
||||
}
|
||||
|
||||
// DEPRECATED: 더 이상 사용하지 않는 Branch 관련 메서드들
|
||||
/*
|
||||
Future<Branch> getBranchDetail(int companyId, int branchId) async {
|
||||
try {
|
||||
final response = await _remoteDataSource.getBranchDetail(companyId, branchId);
|
||||
@@ -231,9 +220,10 @@ class CompanyService {
|
||||
throw ServerFailure(message: 'Failed to fetch company branches: $e');
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// 회사-지점 전체 정보 조회
|
||||
Future<List<CompanyWithBranches>> getCompaniesWithBranches() async {
|
||||
Future<List<CompanyWithChildren>> getCompaniesWithBranches() async {
|
||||
try {
|
||||
return await _remoteDataSource.getCompaniesWithBranches();
|
||||
} on ApiException catch (e) {
|
||||
@@ -386,6 +376,7 @@ class CompanyService {
|
||||
isActive: dto.isActive,
|
||||
isPartner: dto.isPartner,
|
||||
isCustomer: dto.isCustomer,
|
||||
parentCompanyId: dto.parentCompanyId,
|
||||
createdAt: dto.createdAt,
|
||||
updatedAt: null, // CompanyListDto에는 updatedAt이 없음
|
||||
branches: [], // branches는 빈 배열로 초기화
|
||||
@@ -426,12 +417,21 @@ class CompanyService {
|
||||
isActive: dto.isActive,
|
||||
isPartner: dto.isPartner,
|
||||
isCustomer: dto.isCustomer,
|
||||
parentCompanyId: dto.parentCompanyId,
|
||||
createdAt: dto.createdAt,
|
||||
updatedAt: dto.updatedAt,
|
||||
branches: [], // branches는 빈 배열로 초기화
|
||||
);
|
||||
}
|
||||
|
||||
// CompanyListDto를 CompanyItem으로 변환 (본사 목록용)
|
||||
CompanyItem _convertListDtoToCompanyItem(CompanyListDto dto) {
|
||||
final company = _convertListDtoToCompany(dto);
|
||||
return CompanyItem(company: company);
|
||||
}
|
||||
|
||||
// DEPRECATED: Branch 변환 메서드들 (계층형 Company 구조로 대체)
|
||||
/*
|
||||
Branch _convertBranchDtoToBranch(BranchListDto dto) {
|
||||
return Branch(
|
||||
id: dto.id,
|
||||
@@ -454,6 +454,63 @@ class CompanyService {
|
||||
remark: dto.remark,
|
||||
);
|
||||
}
|
||||
*/
|
||||
|
||||
// 본사 목록 조회 (페이지네이션 포함) - 개수 확인용
|
||||
Future<Either<Failure, PaginatedResponse<Company>>> getHeadquartersWithPagination() async {
|
||||
try {
|
||||
final response = await _remoteDataSource.getHeadquartersWithPagination();
|
||||
|
||||
return Right(PaginatedResponse<Company>(
|
||||
items: response.items.map((dto) => _convertListDtoToCompany(dto)).toList(),
|
||||
page: response.page,
|
||||
size: response.size,
|
||||
totalElements: response.totalElements,
|
||||
totalPages: response.totalPages,
|
||||
first: response.first,
|
||||
last: response.last,
|
||||
));
|
||||
} on ApiException catch (e) {
|
||||
debugPrint('[CompanyService] ApiException in getHeadquartersWithPagination: ${e.message}');
|
||||
return Left(ServerFailure(message: e.message));
|
||||
} catch (e, stackTrace) {
|
||||
debugPrint('[CompanyService] Error loading headquarters with pagination: $e');
|
||||
debugPrint('[CompanyService] Stack trace: $stackTrace');
|
||||
return Left(ServerFailure(message: 'Failed to fetch headquarters list with pagination: $e'));
|
||||
}
|
||||
}
|
||||
|
||||
// 본사 목록 조회 (지점 추가 시 사용)
|
||||
Future<Either<Failure, List<CompanyItem>>> getHeadquarters() async {
|
||||
try {
|
||||
final response = await _remoteDataSource.getHeadquarters();
|
||||
final companyItems = response.map((dto) => _convertListDtoToCompanyItem(dto)).toList();
|
||||
return Right(companyItems);
|
||||
} on ApiException catch (e) {
|
||||
debugPrint('[CompanyService] ApiException in getHeadquarters: ${e.message}');
|
||||
return Left(ServerFailure(message: e.message));
|
||||
} catch (e, stackTrace) {
|
||||
debugPrint('[CompanyService] Error loading headquarters: $e');
|
||||
debugPrint('[CompanyService] Stack trace: $stackTrace');
|
||||
return Left(ServerFailure(message: 'Failed to fetch headquarters list: $e'));
|
||||
}
|
||||
}
|
||||
|
||||
// 모든 본사 목록 조회 (지점 추가 드롭다운용 - 전체 목록 한번에 로드)
|
||||
Future<Either<Failure, List<CompanyItem>>> getAllHeadquarters() async {
|
||||
try {
|
||||
final response = await _remoteDataSource.getAllHeadquarters();
|
||||
final companyItems = response.map((dto) => _convertListDtoToCompanyItem(dto)).toList();
|
||||
return Right(companyItems);
|
||||
} on ApiException catch (e) {
|
||||
debugPrint('[CompanyService] ApiException in getAllHeadquarters: ${e.message}');
|
||||
return Left(ServerFailure(message: e.message));
|
||||
} catch (e, stackTrace) {
|
||||
debugPrint('[CompanyService] Error loading all headquarters: $e');
|
||||
debugPrint('[CompanyService] Stack trace: $stackTrace');
|
||||
return Left(ServerFailure(message: 'Failed to fetch all headquarters list: $e'));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Company 모델에 copyWith 메서드가 없다면 extension으로 추가
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:get_it/get_it.dart';
|
||||
import 'package:superport/core/errors/exceptions.dart';
|
||||
import 'package:superport/core/errors/failures.dart';
|
||||
import 'package:superport/core/utils/equipment_status_converter.dart';
|
||||
import 'package:superport/data/datasources/remote/equipment_remote_datasource.dart';
|
||||
import 'package:superport/data/models/common/paginated_response.dart';
|
||||
import 'package:superport/data/models/equipment/equipment_history_dto.dart';
|
||||
@@ -136,8 +137,13 @@ class EquipmentService {
|
||||
manufacturer: equipment.manufacturer,
|
||||
modelName: equipment.name, // 실제 장비명
|
||||
serialNumber: equipment.serialNumber,
|
||||
barcode: equipment.barcode,
|
||||
purchaseDate: equipment.inDate,
|
||||
purchasePrice: null, // 가격 정보는 별도 관리
|
||||
purchasePrice: equipment.purchasePrice,
|
||||
companyId: equipment.currentCompanyId,
|
||||
warehouseLocationId: equipment.warehouseLocationId,
|
||||
lastInspectionDate: equipment.lastInspectionDate,
|
||||
nextInspectionDate: equipment.nextInspectionDate,
|
||||
remark: equipment.remark,
|
||||
);
|
||||
|
||||
@@ -183,17 +189,56 @@ class EquipmentService {
|
||||
Future<Equipment> updateEquipment(int id, Equipment equipment) async {
|
||||
try {
|
||||
final request = UpdateEquipmentRequest(
|
||||
category1: equipment.category,
|
||||
category2: equipment.subCategory,
|
||||
category3: equipment.subSubCategory,
|
||||
manufacturer: equipment.manufacturer,
|
||||
modelName: equipment.name, // 실제 장비명
|
||||
serialNumber: equipment.serialNumber,
|
||||
barcode: equipment.barcode,
|
||||
category1: equipment.category.isNotEmpty ? equipment.category : null,
|
||||
category2: equipment.subCategory.isNotEmpty ? equipment.subCategory : null,
|
||||
category3: equipment.subSubCategory.isNotEmpty ? equipment.subSubCategory : null,
|
||||
manufacturer: equipment.manufacturer.isNotEmpty ? equipment.manufacturer : null,
|
||||
modelName: equipment.name.isNotEmpty ? equipment.name : null, // 실제 장비명
|
||||
serialNumber: equipment.serialNumber?.isNotEmpty == true ? equipment.serialNumber : null,
|
||||
barcode: equipment.barcode?.isNotEmpty == true ? equipment.barcode : null,
|
||||
purchaseDate: equipment.inDate,
|
||||
purchasePrice: null, // 가격 정보는 별도 관리
|
||||
remark: equipment.remark,
|
||||
purchasePrice: equipment.purchasePrice,
|
||||
status: (equipment.equipmentStatus != null &&
|
||||
equipment.equipmentStatus != 'null' &&
|
||||
equipment.equipmentStatus!.isNotEmpty)
|
||||
? EquipmentStatusConverter.clientToServer(equipment.equipmentStatus)
|
||||
: null,
|
||||
companyId: equipment.currentCompanyId,
|
||||
warehouseLocationId: equipment.warehouseLocationId,
|
||||
lastInspectionDate: equipment.lastInspectionDate,
|
||||
nextInspectionDate: equipment.nextInspectionDate,
|
||||
remark: equipment.remark?.isNotEmpty == true ? equipment.remark : null,
|
||||
);
|
||||
|
||||
// 디버그 로그 추가 - 전송되는 데이터 확인
|
||||
print('DEBUG [EquipmentService.updateEquipment] Equipment model data:');
|
||||
print(' equipment.equipmentStatus: "${equipment.equipmentStatus}"');
|
||||
print(' equipment.equipmentStatus type: ${equipment.equipmentStatus.runtimeType}');
|
||||
print(' equipment.equipmentStatus == null: ${equipment.equipmentStatus == null}');
|
||||
print(' equipment.equipmentStatus == "null": ${equipment.equipmentStatus == "null"}');
|
||||
|
||||
String? convertedStatus;
|
||||
if (equipment.equipmentStatus != null) {
|
||||
convertedStatus = EquipmentStatusConverter.clientToServer(equipment.equipmentStatus);
|
||||
print(' converted status: "$convertedStatus"');
|
||||
} else {
|
||||
print(' status is null, will not set in request');
|
||||
}
|
||||
|
||||
print('DEBUG [EquipmentService.updateEquipment] Request data:');
|
||||
print(' manufacturer: "${request.manufacturer}"');
|
||||
print(' modelName: "${request.modelName}"');
|
||||
print(' serialNumber: "${request.serialNumber}"');
|
||||
print(' status: "${request.status}"');
|
||||
print(' companyId: ${request.companyId}');
|
||||
print(' warehouseLocationId: ${request.warehouseLocationId}');
|
||||
|
||||
// JSON 직렬화 확인
|
||||
final jsonData = request.toJson();
|
||||
print('DEBUG [EquipmentService.updateEquipment] JSON data:');
|
||||
jsonData.forEach((key, value) {
|
||||
print(' $key: $value (${value.runtimeType})');
|
||||
});
|
||||
|
||||
final response = await _remoteDataSource.updateEquipment(id, request);
|
||||
return _convertResponseToEquipment(response);
|
||||
@@ -284,7 +329,6 @@ class EquipmentService {
|
||||
required int equipmentId,
|
||||
required int quantity,
|
||||
required int companyId,
|
||||
int? branchId,
|
||||
String? notes,
|
||||
}) async {
|
||||
try {
|
||||
@@ -292,7 +336,6 @@ class EquipmentService {
|
||||
equipmentId: equipmentId,
|
||||
quantity: quantity,
|
||||
companyId: companyId,
|
||||
branchId: branchId,
|
||||
notes: notes,
|
||||
);
|
||||
|
||||
@@ -318,6 +361,10 @@ class EquipmentService {
|
||||
quantity: 1, // Default quantity
|
||||
inDate: dto.createdAt,
|
||||
remark: null, // Not in list DTO
|
||||
// 백엔드 API 새로운 필드들 (리스트 DTO에서는 제한적)
|
||||
currentCompanyId: dto.companyId,
|
||||
warehouseLocationId: dto.warehouseLocationId,
|
||||
equipmentStatus: dto.status,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -339,6 +386,13 @@ class EquipmentService {
|
||||
quantity: 1, // Default quantity, actual quantity should be tracked in history
|
||||
inDate: response.purchaseDate,
|
||||
remark: response.remark,
|
||||
// 백엔드 API 새로운 필드들 매핑
|
||||
purchasePrice: response.purchasePrice != null ? double.tryParse(response.purchasePrice!) : null,
|
||||
currentCompanyId: response.companyId,
|
||||
warehouseLocationId: response.warehouseLocationId,
|
||||
lastInspectionDate: response.lastInspectionDate,
|
||||
nextInspectionDate: response.nextInspectionDate,
|
||||
equipmentStatus: response.status,
|
||||
// Warranty information would need to be fetched from license API if available
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user