refactor: UI 화면 통합 및 불필요한 파일 정리
- 모든 *_redesign.dart 파일을 기본 화면 파일로 통합 - 백업용 컨트롤러 파일들 제거 (*_controller.backup.dart) - 사용하지 않는 예제 및 테스트 파일 제거 - Clean Architecture 적용 후 남은 정리 작업 완료 - 테스트 코드 정리 및 구조 개선 준비 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,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/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';
|
||||
import 'package:superport/data/models/equipment/equipment_in_request.dart';
|
||||
import 'package:superport/data/models/equipment/equipment_io_response.dart';
|
||||
@@ -15,7 +16,7 @@ class EquipmentService {
|
||||
final EquipmentRemoteDataSource _remoteDataSource = GetIt.instance<EquipmentRemoteDataSource>();
|
||||
|
||||
// 장비 목록 조회 (DTO 형태로 반환하여 status 정보 유지)
|
||||
Future<List<EquipmentListDto>> getEquipmentsWithStatus({
|
||||
Future<PaginatedResponse<EquipmentListDto>> getEquipmentsWithStatus({
|
||||
int page = 1,
|
||||
int perPage = 20,
|
||||
String? status,
|
||||
@@ -24,7 +25,7 @@ class EquipmentService {
|
||||
String? search,
|
||||
}) async {
|
||||
try {
|
||||
final dtoList = await _remoteDataSource.getEquipments(
|
||||
final response = await _remoteDataSource.getEquipments(
|
||||
page: page,
|
||||
perPage: perPage,
|
||||
status: status,
|
||||
@@ -33,7 +34,15 @@ class EquipmentService {
|
||||
search: search,
|
||||
);
|
||||
|
||||
return dtoList;
|
||||
return PaginatedResponse<EquipmentListDto>(
|
||||
items: response.items,
|
||||
page: response.page,
|
||||
size: response.perPage,
|
||||
totalElements: response.total,
|
||||
totalPages: response.totalPages,
|
||||
first: response.page == 1,
|
||||
last: response.page >= response.totalPages,
|
||||
);
|
||||
} on ServerException catch (e) {
|
||||
throw ServerFailure(message: e.message);
|
||||
} catch (e) {
|
||||
@@ -42,7 +51,7 @@ class EquipmentService {
|
||||
}
|
||||
|
||||
// 장비 목록 조회
|
||||
Future<List<Equipment>> getEquipments({
|
||||
Future<PaginatedResponse<Equipment>> getEquipments({
|
||||
int page = 1,
|
||||
int perPage = 20,
|
||||
String? status,
|
||||
@@ -51,7 +60,7 @@ class EquipmentService {
|
||||
String? search,
|
||||
}) async {
|
||||
try {
|
||||
final dtoList = await _remoteDataSource.getEquipments(
|
||||
final response = await _remoteDataSource.getEquipments(
|
||||
page: page,
|
||||
perPage: perPage,
|
||||
status: status,
|
||||
@@ -60,7 +69,15 @@ class EquipmentService {
|
||||
search: search,
|
||||
);
|
||||
|
||||
return dtoList.map((dto) => _convertListDtoToEquipment(dto)).toList();
|
||||
return PaginatedResponse<Equipment>(
|
||||
items: response.items.map((dto) => _convertListDtoToEquipment(dto)).toList(),
|
||||
page: response.page,
|
||||
size: response.perPage,
|
||||
totalElements: response.total,
|
||||
totalPages: response.totalPages,
|
||||
first: response.page == 1,
|
||||
last: response.page >= response.totalPages,
|
||||
);
|
||||
} on ServerException catch (e) {
|
||||
throw ServerFailure(message: e.message);
|
||||
} catch (e) {
|
||||
@@ -68,6 +85,42 @@ class EquipmentService {
|
||||
}
|
||||
}
|
||||
|
||||
// 입고된 장비 목록 조회
|
||||
Future<PaginatedResponse<EquipmentListDto>> getEquipmentInList({
|
||||
int page = 1,
|
||||
int perPage = 20,
|
||||
int? companyId,
|
||||
int? warehouseLocationId,
|
||||
String? search,
|
||||
}) async {
|
||||
return getEquipmentsWithStatus(
|
||||
page: page,
|
||||
perPage: perPage,
|
||||
status: 'available', // 입고된 장비는 사용 가능 상태
|
||||
companyId: companyId,
|
||||
warehouseLocationId: warehouseLocationId,
|
||||
search: search,
|
||||
);
|
||||
}
|
||||
|
||||
// 출고된 장비 목록 조회
|
||||
Future<PaginatedResponse<EquipmentListDto>> getEquipmentOutList({
|
||||
int page = 1,
|
||||
int perPage = 20,
|
||||
int? companyId,
|
||||
int? warehouseLocationId,
|
||||
String? search,
|
||||
}) async {
|
||||
return getEquipmentsWithStatus(
|
||||
page: page,
|
||||
perPage: perPage,
|
||||
status: 'in_use', // 출고된 장비는 사용 중 상태
|
||||
companyId: companyId,
|
||||
warehouseLocationId: warehouseLocationId,
|
||||
search: search,
|
||||
);
|
||||
}
|
||||
|
||||
// 장비 생성
|
||||
Future<Equipment> createEquipment(Equipment equipment) async {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user