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

feat: API 연동 개선 및 라이선스 모델 확장

Browse Source 
- 라이선스 모델 전면 개편 (상세 필드 추가, 계산 필드 구현)
- API 응답 처리 개선 (HTTP 상태 코드 기반)
- 장비 출고 폼 컨트롤러 추가
- 회사 지점 정보 모델 추가
- 공통 데이터 모델 구조 추가
- 전체 서비스 레이어 API 호출 방식 통일
- UI 컴포넌트 마이너 개선
This commit is contained in:
JiWoong Sul
2025-07-25 01:22:15 +09:00
parent 8384423cf2
commit 71b7b7f40b
42 changed files with 1543 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/data/datasources/remote/auth_remote_datasource.dart
View File

@@ -29,12 +29,12 @@ class AuthRemoteDataSourceImpl implements AuthRemoteDataSource {
data: request.toJson(),
);
if (response.success && response.data != null) {
if (response.statusCode == 200 && response.data != null) {
final loginResponse = LoginResponse.fromJson(response.data);
return Right(loginResponse);
} else {
return Left(ServerFailure(
message: response.error?.message ?? '로그인 실패',
message: response.statusMessage ?? '로그인 실패',
));
}
} catch (e) {
@@ -58,11 +58,11 @@ class AuthRemoteDataSourceImpl implements AuthRemoteDataSource {
data: request.toJson(),
);
if (response.success) {
if (response.statusCode == 200) {
return const Right(null);
} else {
return Left(ServerFailure(
message: response.error?.message ?? '로그아웃 실패',
message: response.statusMessage ?? '로그아웃 실패',
));
}
} catch (e) {
@@ -81,12 +81,12 @@ class AuthRemoteDataSourceImpl implements AuthRemoteDataSource {
data: request.toJson(),
);
if (response.success && response.data != null) {
if (response.statusCode == 200 && response.data != null) {
final tokenResponse = TokenResponse.fromJson(response.data);
return Right(tokenResponse);
} else {
return Left(ServerFailure(
message: response.error?.message ?? '토큰 갱신 실패',
message: response.statusMessage ?? '토큰 갱신 실패',
));
}
} catch (e) {

39
lib/data/datasources/remote/company_remote_datasource.dart
View File

@@ -1,5 +1,4 @@
import 'package:dio/dio.dart';
import 'package:get_it/get_it.dart';
import 'package:injectable/injectable.dart';
import 'package:superport/core/constants/api_endpoints.dart';
import 'package:superport/core/errors/exceptions.dart';
@@ -80,11 +79,11 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
final apiResponse = ApiResponse<PaginatedResponse<CompanyListDto>>.fromJson(
response.data,
(json) => PaginatedResponse<CompanyListDto>.fromJson(
json,
(item) => CompanyListDto.fromJson(item),
json as Map<String, dynamic>,
(item) => CompanyListDto.fromJson(item as Map<String, dynamic>),
),
);
return apiResponse.data;
return apiResponse.data!;
} else {
throw ApiException(
message: 'Failed to load companies',
@@ -108,9 +107,9 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
if (response.statusCode == 201) {
final apiResponse = ApiResponse<CompanyResponse>.fromJson(
response.data,
(json) => CompanyResponse.fromJson(json),
(json) => CompanyResponse.fromJson(json as Map<String, dynamic>),
);
return apiResponse.data;
return apiResponse.data!;
} else {
throw ApiException(
message: 'Failed to create company',
@@ -134,7 +133,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to fetch company detail',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -150,7 +149,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to fetch company with branches',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -167,7 +166,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to update company',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -181,7 +180,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to delete company',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -198,7 +197,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to fetch company names',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -216,7 +215,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to create branch',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -232,7 +231,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to fetch branch detail',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -249,7 +248,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to update branch',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -263,7 +262,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to delete branch',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -280,7 +279,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
} on DioException catch (e) {
throw ServerException(
message: e.response?.data['message'] ?? 'Failed to fetch company branches',
code: e.response?.statusCode,
statusCode: e.response?.statusCode,
);
}
}
@@ -297,7 +296,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
.map((item) => CompanyWithBranches.fromJson(item))
.toList(),
);
return apiResponse.data;
return apiResponse.data!;
} else {
throw ApiException(
message: 'Failed to load companies with branches',
@@ -321,9 +320,9 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
if (response.statusCode == 200) {
final apiResponse = ApiResponse<Map<String, dynamic>>.fromJson(
response.data,
(json) => json,
(json) => json as Map<String, dynamic>,
);
return apiResponse.data['exists'] ?? false;
return apiResponse.data?['exists'] ?? false;
} else {
throw ApiException(
message: 'Failed to check duplicate',
@@ -351,7 +350,7 @@ class CompanyRemoteDataSourceImpl implements CompanyRemoteDataSource {
.map((item) => CompanyListDto.fromJson(item))
.toList(),
);
return apiResponse.data;
return apiResponse.data!;
} else {
throw ApiException(
message: 'Failed to search companies',

34
lib/data/datasources/remote/dashboard_remote_datasource.dart
View File

@@ -1,8 +1,6 @@
import 'package:dartz/dartz.dart';
import 'package:dio/dio.dart';
import 'package:injectable/injectable.dart';
import 'package:superport/core/constants/api_endpoints.dart';
import 'package:superport/core/errors/exceptions.dart';
import 'package:superport/core/errors/failures.dart';
import 'package:superport/data/datasources/remote/api_client.dart';
import 'package:superport/data/models/dashboard/equipment_status_distribution.dart';
@@ -32,12 +30,12 @@ class DashboardRemoteDataSourceImpl implements DashboardRemoteDataSource {
final stats = OverviewStats.fromJson(response.data);
return Right(stats);
} else {
return Left(ServerFailure('응답 데이터가 없습니다'));
return Left(ServerFailure(message: '응답 데이터가 없습니다'));
}
} on DioException catch (e) {
return Left(_handleDioError(e));
} catch (e) {
return Left(ServerFailure('통계 데이터를 가져오는 중 오류가 발생했습니다'));
return Left(ServerFailure(message: '통계 데이터를 가져오는 중 오류가 발생했습니다'));
}
}
@@ -52,12 +50,12 @@ class DashboardRemoteDataSourceImpl implements DashboardRemoteDataSource {
.toList();
return Right(activities);
} else {
return Left(ServerFailure('응답 데이터가 올바르지 않습니다'));
return Left(ServerFailure(message: '응답 데이터가 올바르지 않습니다'));
}
} on DioException catch (e) {
return Left(_handleDioError(e));
} catch (e) {
return Left(ServerFailure('최근 활동을 가져오는 중 오류가 발생했습니다'));
return Left(ServerFailure(message: '최근 활동을 가져오는 중 오류가 발생했습니다'));
}
}
@@ -70,12 +68,12 @@ class DashboardRemoteDataSourceImpl implements DashboardRemoteDataSource {
final distribution = EquipmentStatusDistribution.fromJson(response.data);
return Right(distribution);
} else {
return Left(ServerFailure('응답 데이터가 없습니다'));
return Left(ServerFailure(message: '응답 데이터가 없습니다'));
}
} on DioException catch (e) {
return Left(_handleDioError(e));
} catch (e) {
return Left(ServerFailure('장비 상태 분포를 가져오는 중 오류가 발생했습니다'));
return Left(ServerFailure(message: '장비 상태 분포를 가져오는 중 오류가 발생했습니다'));
}
}
@@ -93,12 +91,12 @@ class DashboardRemoteDataSourceImpl implements DashboardRemoteDataSource {
.toList();
return Right(licenses);
} else {
return Left(ServerFailure('응답 데이터가 올바르지 않습니다'));
return Left(ServerFailure(message: '응답 데이터가 올바르지 않습니다'));
}
} on DioException catch (e) {
return Left(_handleDioError(e));
} catch (e) {
return Left(ServerFailure('만료 예정 라이선스를 가져오는 중 오류가 발생했습니다'));
return Left(ServerFailure(message: '만료 예정 라이선스를 가져오는 중 오류가 발생했습니다'));
}
}
@@ -107,26 +105,26 @@ class DashboardRemoteDataSourceImpl implements DashboardRemoteDataSource {
case DioExceptionType.connectionTimeout:
case DioExceptionType.sendTimeout:
case DioExceptionType.receiveTimeout:
return NetworkFailure('네트워크 연결 시간이 초과되었습니다');
return NetworkFailure(message: '네트워크 연결 시간이 초과되었습니다');
case DioExceptionType.connectionError:
return NetworkFailure('서버에 연결할 수 없습니다');
return NetworkFailure(message: '서버에 연결할 수 없습니다');
case DioExceptionType.badResponse:
final statusCode = error.response?.statusCode ?? 0;
final message = error.response?.data?['message'] ?? '서버 오류가 발생했습니다';
if (statusCode == 401) {
return AuthFailure('인증이 만료되었습니다');
return AuthenticationFailure(message: '인증이 만료되었습니다');
} else if (statusCode == 403) {
return AuthFailure('접근 권한이 없습니다');
return AuthenticationFailure(message: '접근 권한이 없습니다');
} else if (statusCode >= 400 && statusCode < 500) {
return ServerFailure(message);
return ServerFailure(message: message);
} else {
return ServerFailure('서버 오류가 발생했습니다 ($statusCode)');
return ServerFailure(message: '서버 오류가 발생했습니다 ($statusCode)');
}
case DioExceptionType.cancel:
return ServerFailure('요청이 취소되었습니다');
return ServerFailure(message: '요청이 취소되었습니다');
default:
return ServerFailure('알 수 없는 오류가 발생했습니다');
return ServerFailure(message: '알 수 없는 오류가 발생했습니다');
}
}
}

1
lib/data/datasources/remote/license_remote_datasource.dart
View File

@@ -4,6 +4,7 @@ import 'package:superport/core/errors/exceptions.dart';
import 'package:superport/data/datasources/remote/api_client.dart';
import 'package:superport/data/models/license/license_dto.dart';
import 'package:superport/data/models/license/license_request_dto.dart';
import 'package:superport/data/models/license/license_query_dto.dart';
abstract class LicenseRemoteDataSource {
Future<LicenseListResponseDto> getLicenses({