web: migrate health notifications to js_interop; add browser hook
- Replace dart:js with package:js in health_check_service_web.dart\n- Implement showHealthCheckNotification in web/index.html\n- Pin js dependency to ^0.6.7 for flutter_secure_storage_web compatibility auth: harden AuthInterceptor + tests - Allow overrideAuthRepository injection for testing\n- Normalize imports to package: paths\n- Add unit test covering token attach, 401→refresh→retry, and failure path\n- Add integration test skeleton gated by env vars ui/data: map User.companyName to list column - Add companyName to domain User\n- Map UserDto.company?.name\n- Render companyName in user_list cleanup: remove legacy equipment table + unused code; minor warnings - Remove _buildFlexibleTable and unused helpers\n- Remove unused zipcode details and cache retry constant\n- Fix null-aware and non-null assertions\n- Address child-last warnings in administrator dialog docs: update AGENTS.md session context
This commit is contained in:
@@ -1,34 +1,17 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/auth_service.dart';
|
||||
import '../../../data/models/user/user_dto.dart';
|
||||
import '../../repositories/auth_repository.dart';
|
||||
import '../../../data/models/auth/auth_user.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
|
||||
/// 현재 로그인한 사용자 정보 조회 UseCase
|
||||
class GetCurrentUserUseCase extends UseCase<UserDto?, NoParams> {
|
||||
final AuthService _authService;
|
||||
/// 현재 로그인한 사용자 정보 조회 UseCase (AuthRepository 기반)
|
||||
class GetCurrentUserUseCase extends UseCase<AuthUser, NoParams> {
|
||||
final AuthRepository _authRepository;
|
||||
|
||||
GetCurrentUserUseCase(this._authService);
|
||||
GetCurrentUserUseCase(this._authRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, UserDto?>> call(NoParams params) async {
|
||||
try {
|
||||
final user = await _authService.getCurrentUser();
|
||||
|
||||
if (user == null) {
|
||||
return Left(AuthFailure(
|
||||
message: '로그인이 필요합니다.',
|
||||
code: 'NOT_AUTHENTICATED',
|
||||
));
|
||||
}
|
||||
|
||||
// AuthUser를 UserDto로 변환 (임시로 null 반환)
|
||||
return const Right(null);
|
||||
} catch (e) {
|
||||
return Left(UnknownFailure(
|
||||
message: '사용자 정보를 가져오는 중 오류가 발생했습니다.',
|
||||
originalError: e,
|
||||
));
|
||||
}
|
||||
Future<Either<Failure, AuthUser>> call(NoParams params) async {
|
||||
return await _authRepository.getCurrentUser();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/auth_service.dart';
|
||||
import '../../repositories/auth_repository.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
|
||||
/// 로그아웃 UseCase
|
||||
/// 사용자 로그아웃 처리 및 토큰 삭제
|
||||
class LogoutUseCase extends UseCase<void, NoParams> {
|
||||
final AuthService _authService;
|
||||
// AuthRepository 기반으로 마이그레이션
|
||||
final AuthRepository _authRepository;
|
||||
|
||||
LogoutUseCase(this._authService);
|
||||
LogoutUseCase(this._authRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, void>> call(NoParams params) async {
|
||||
return await _authService.logout();
|
||||
return await _authRepository.logout();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,56 +1,33 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import '../../../services/auth_service.dart';
|
||||
import '../../../data/models/auth/token_response.dart';
|
||||
import '../../../data/models/auth/refresh_token_request.dart';
|
||||
import '../../repositories/auth_repository.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
|
||||
/// 토큰 갱신 UseCase
|
||||
/// JWT 토큰을 갱신하여 세션 유지
|
||||
class RefreshTokenUseCase extends UseCase<TokenResponse, NoParams> {
|
||||
final AuthService _authService;
|
||||
// AuthRepository 기반으로 마이그레이션
|
||||
final AuthRepository _authRepository;
|
||||
|
||||
RefreshTokenUseCase(this._authService);
|
||||
RefreshTokenUseCase(this._authRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, TokenResponse>> call(NoParams params) async {
|
||||
try {
|
||||
final refreshToken = await _authService.getRefreshToken();
|
||||
|
||||
if (refreshToken == null) {
|
||||
return Left(AuthFailure(
|
||||
message: '갱신 토큰이 없습니다. 다시 로그인해주세요.',
|
||||
code: 'NO_REFRESH_TOKEN',
|
||||
));
|
||||
}
|
||||
|
||||
return await _authService.refreshToken();
|
||||
} on DioException catch (e) {
|
||||
if (e.response?.statusCode == 401) {
|
||||
return Left(AuthFailure(
|
||||
message: '세션이 만료되었습니다. 다시 로그인해주세요.',
|
||||
code: 'SESSION_EXPIRED',
|
||||
originalError: e,
|
||||
));
|
||||
} else if (e.type == DioExceptionType.connectionTimeout ||
|
||||
e.type == DioExceptionType.receiveTimeout) {
|
||||
return Left(NetworkFailure(
|
||||
message: '네트워크 연결 시간이 초과되었습니다.',
|
||||
code: 'TIMEOUT',
|
||||
originalError: e,
|
||||
));
|
||||
} else {
|
||||
return Left(ServerFailure(
|
||||
message: '서버 오류가 발생했습니다.',
|
||||
code: e.response?.statusCode?.toString(),
|
||||
originalError: e,
|
||||
));
|
||||
}
|
||||
} catch (e) {
|
||||
return Left(UnknownFailure(
|
||||
message: '토큰 갱신 중 오류가 발생했습니다.',
|
||||
originalError: e,
|
||||
));
|
||||
}
|
||||
final stored = await _authRepository.getStoredRefreshToken();
|
||||
return await stored.fold(
|
||||
(failure) => Left(failure),
|
||||
(token) async {
|
||||
if (token == null || token.isEmpty) {
|
||||
return Left(AuthFailure(
|
||||
message: '갱신 토큰이 없습니다. 다시 로그인해주세요.',
|
||||
code: 'NO_REFRESH_TOKEN',
|
||||
));
|
||||
}
|
||||
final request = RefreshTokenRequest(refreshToken: token);
|
||||
return await _authRepository.refreshToken(request);
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../../../models/company_model.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
@@ -15,9 +15,10 @@ class CreateCompanyParams {
|
||||
|
||||
/// 회사 생성 UseCase
|
||||
class CreateCompanyUseCase extends UseCase<Company, CreateCompanyParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
CreateCompanyUseCase(this._companyService);
|
||||
CreateCompanyUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, Company>> call(CreateCompanyParams params) async {
|
||||
@@ -28,8 +29,8 @@ class CreateCompanyUseCase extends UseCase<Company, CreateCompanyParams> {
|
||||
return Left(validationResult);
|
||||
}
|
||||
|
||||
final company = await _companyService.createCompany(params.company);
|
||||
return Right(company);
|
||||
final result = await _companyRepository.createCompany(params.company);
|
||||
return result;
|
||||
} on ServerFailure catch (e) {
|
||||
return Left(ServerFailure(
|
||||
message: e.message,
|
||||
@@ -81,4 +82,4 @@ class CreateCompanyUseCase extends UseCase<Company, CreateCompanyParams> {
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
|
||||
@@ -14,15 +14,16 @@ class DeleteCompanyParams {
|
||||
|
||||
/// 회사 삭제 UseCase
|
||||
class DeleteCompanyUseCase extends UseCase<void, DeleteCompanyParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
DeleteCompanyUseCase(this._companyService);
|
||||
DeleteCompanyUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, void>> call(DeleteCompanyParams params) async {
|
||||
try {
|
||||
await _companyService.deleteCompany(params.id);
|
||||
return const Right(null);
|
||||
final result = await _companyRepository.deleteCompany(params.id);
|
||||
return result;
|
||||
} on ServerFailure catch (e) {
|
||||
if (e.message.contains('associated')) {
|
||||
return Left(ValidationFailure(
|
||||
@@ -41,4 +42,4 @@ class DeleteCompanyUseCase extends UseCase<void, DeleteCompanyParams> {
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../../../models/company_model.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
@@ -17,22 +17,17 @@ class GetCompanyDetailParams {
|
||||
|
||||
/// 회사 상세 조회 UseCase
|
||||
class GetCompanyDetailUseCase extends UseCase<Company, GetCompanyDetailParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
GetCompanyDetailUseCase(this._companyService);
|
||||
GetCompanyDetailUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, Company>> call(GetCompanyDetailParams params) async {
|
||||
try {
|
||||
final Company company;
|
||||
|
||||
if (params.includeBranches) {
|
||||
company = await _companyService.getCompanyWithChildren(params.id);
|
||||
} else {
|
||||
company = await _companyService.getCompanyDetail(params.id);
|
||||
}
|
||||
|
||||
return Right(company);
|
||||
// 레포지토리에서 상세 조회(자식 포함 형태로 매핑됨)
|
||||
final result = await _companyRepository.getCompanyById(params.id);
|
||||
return result;
|
||||
} on ServerFailure catch (e) {
|
||||
if (e.message.contains('not found')) {
|
||||
return Left(ValidationFailure(
|
||||
@@ -52,4 +47,4 @@ class GetCompanyDetailUseCase extends UseCase<Company, GetCompanyDetailParams> {
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:dartz/dartz.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../../../domain/entities/company_hierarchy.dart';
|
||||
import '../../../models/company_model.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../base_usecase.dart';
|
||||
|
||||
/// 회사 계층 구조 조회 파라미터
|
||||
@@ -16,22 +16,23 @@ class GetCompanyHierarchyParams {
|
||||
|
||||
/// 회사 계층 구조 조회 UseCase
|
||||
class GetCompanyHierarchyUseCase extends UseCase<CompanyHierarchy, GetCompanyHierarchyParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
GetCompanyHierarchyUseCase(this._companyService);
|
||||
GetCompanyHierarchyUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, CompanyHierarchy>> call(GetCompanyHierarchyParams params) async {
|
||||
try {
|
||||
// 모든 회사 조회
|
||||
final response = await _companyService.getCompanies(
|
||||
page: 1,
|
||||
perPage: 1000,
|
||||
// 레포지토리에서 전체 회사(계층 구성용) 조회
|
||||
final companiesEither = await _companyRepository.getCompanyHierarchy(
|
||||
includeInactive: params.includeInactive,
|
||||
);
|
||||
|
||||
// 계층 구조로 변환
|
||||
final hierarchy = _buildHierarchy(response.items);
|
||||
final hierarchy = companiesEither.fold(
|
||||
(failure) => throw failure,
|
||||
(companies) => _buildHierarchy(companies),
|
||||
);
|
||||
|
||||
return Right(hierarchy);
|
||||
} on ServerFailure catch (e) {
|
||||
@@ -125,4 +126,4 @@ class GetCompanyHierarchyUseCase extends UseCase<CompanyHierarchy, GetCompanyHie
|
||||
|
||||
return count;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
|
||||
@@ -16,15 +16,20 @@ class ToggleCompanyStatusParams {
|
||||
|
||||
/// 회사 활성화/비활성화 UseCase
|
||||
class ToggleCompanyStatusUseCase extends UseCase<void, ToggleCompanyStatusParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
ToggleCompanyStatusUseCase(this._companyService);
|
||||
ToggleCompanyStatusUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, void>> call(ToggleCompanyStatusParams params) async {
|
||||
try {
|
||||
await _companyService.updateCompanyStatus(params.id, params.isActive);
|
||||
return const Right(null);
|
||||
// 레포지토리는 토글 방식으로 동작하므로 결과만 확인
|
||||
final result = await _companyRepository.toggleCompanyStatus(params.id);
|
||||
return result.fold(
|
||||
(failure) => Left(failure),
|
||||
(_) => const Right(null),
|
||||
);
|
||||
} on ServerFailure catch (e) {
|
||||
if (e.message.contains('equipment')) {
|
||||
return Left(ValidationFailure(
|
||||
@@ -41,4 +46,4 @@ class ToggleCompanyStatusUseCase extends UseCase<void, ToggleCompanyStatusParams
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../../../models/company_model.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../base_usecase.dart';
|
||||
@@ -17,9 +17,10 @@ class UpdateCompanyParams {
|
||||
|
||||
/// 회사 수정 UseCase
|
||||
class UpdateCompanyUseCase extends UseCase<Company, UpdateCompanyParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
UpdateCompanyUseCase(this._companyService);
|
||||
UpdateCompanyUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, Company>> call(UpdateCompanyParams params) async {
|
||||
@@ -30,8 +31,8 @@ class UpdateCompanyUseCase extends UseCase<Company, UpdateCompanyParams> {
|
||||
return Left(validationResult);
|
||||
}
|
||||
|
||||
final company = await _companyService.updateCompany(params.id, params.company);
|
||||
return Right(company);
|
||||
final result = await _companyRepository.updateCompany(params.id, params.company);
|
||||
return result;
|
||||
} on ServerFailure catch (e) {
|
||||
return Left(ServerFailure(
|
||||
message: e.message,
|
||||
@@ -83,4 +84,4 @@ class UpdateCompanyUseCase extends UseCase<Company, UpdateCompanyParams> {
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ import 'package:dartz/dartz.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../../../core/utils/hierarchy_validator.dart';
|
||||
import '../../../models/company_model.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../base_usecase.dart';
|
||||
import '../../../data/models/company/company_dto.dart';
|
||||
|
||||
@@ -19,21 +19,19 @@ class UpdateParentCompanyParams {
|
||||
|
||||
/// 부모 회사 변경 UseCase
|
||||
class UpdateParentCompanyUseCase extends UseCase<Company, UpdateParentCompanyParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
UpdateParentCompanyUseCase(this._companyService);
|
||||
UpdateParentCompanyUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, Company>> call(UpdateParentCompanyParams params) async {
|
||||
try {
|
||||
// 1. 모든 회사 조회 (검증용)
|
||||
final response = await _companyService.getCompanies(
|
||||
page: 1,
|
||||
perPage: 1000,
|
||||
);
|
||||
final allCompaniesEither = await _companyRepository.getCompanyHierarchy(includeInactive: true);
|
||||
|
||||
// CompanyDto 리스트로 변환 (검증용)
|
||||
final companyResponses = response.items.map((company) => CompanyDto(
|
||||
final companyResponses = allCompaniesEither.getOrElse(() => <Company>[]).map((company) => CompanyDto(
|
||||
id: company.id ?? 0,
|
||||
name: company.name,
|
||||
address: company.address.toString(),
|
||||
@@ -83,18 +81,12 @@ class UpdateParentCompanyUseCase extends UseCase<Company, UpdateParentCompanyPar
|
||||
));
|
||||
}
|
||||
|
||||
// 5. 현재 회사 정보 조회
|
||||
final currentCompany = await _companyService.getCompanyDetail(params.companyId);
|
||||
|
||||
// 6. 부모 회사 ID만 변경
|
||||
final updatedCompany = currentCompany.copyWith(
|
||||
parentCompanyId: params.newParentId,
|
||||
// 5~7. 레포지토리 메서드로 부모 변경 수행
|
||||
final updateEither = await _companyRepository.updateParentCompany(
|
||||
params.companyId,
|
||||
params.newParentId,
|
||||
);
|
||||
|
||||
// 7. 업데이트 실행
|
||||
final result = await _companyService.updateCompany(params.companyId, updatedCompany);
|
||||
|
||||
return Right(result);
|
||||
return updateEither;
|
||||
} on ServerFailure catch (e) {
|
||||
return Left(ServerFailure(
|
||||
message: e.message,
|
||||
@@ -107,4 +99,4 @@ class UpdateParentCompanyUseCase extends UseCase<Company, UpdateParentCompanyPar
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import 'package:dartz/dartz.dart';
|
||||
import '../../../core/errors/failures.dart';
|
||||
import '../../../core/utils/hierarchy_validator.dart';
|
||||
import '../../../services/company_service.dart';
|
||||
import '../../repositories/company_repository.dart';
|
||||
import '../base_usecase.dart';
|
||||
import '../../../data/models/company/company_dto.dart';
|
||||
import '../../../models/company_model.dart';
|
||||
|
||||
/// 회사 삭제 가능 여부 검증 파라미터
|
||||
class ValidateCompanyDeletionParams {
|
||||
@@ -29,23 +30,21 @@ class CompanyDeletionValidationResult {
|
||||
|
||||
/// 회사 삭제 가능 여부 검증 UseCase
|
||||
class ValidateCompanyDeletionUseCase extends UseCase<CompanyDeletionValidationResult, ValidateCompanyDeletionParams> {
|
||||
final CompanyService _companyService;
|
||||
// 레포지토리 기반으로 마이그레이션
|
||||
final CompanyRepository _companyRepository;
|
||||
|
||||
ValidateCompanyDeletionUseCase(this._companyService);
|
||||
ValidateCompanyDeletionUseCase(this._companyRepository);
|
||||
|
||||
@override
|
||||
Future<Either<Failure, CompanyDeletionValidationResult>> call(ValidateCompanyDeletionParams params) async {
|
||||
try {
|
||||
final blockers = <String>[];
|
||||
|
||||
// 1. 자식 회사 존재 여부 확인
|
||||
final response = await _companyService.getCompanies(
|
||||
page: 1,
|
||||
perPage: 1000,
|
||||
);
|
||||
|
||||
// 1. 전체 회사(계층 구성용) 조회
|
||||
final companiesEither = await _companyRepository.getCompanyHierarchy(includeInactive: true);
|
||||
|
||||
// CompanyDto 리스트로 변환 (검증용)
|
||||
final companyResponses = response.items.map((company) => CompanyDto(
|
||||
final companyResponses = companiesEither.getOrElse(() => <Company>[]).map((company) => CompanyDto(
|
||||
id: company.id ?? 0,
|
||||
name: company.name,
|
||||
address: company.address.toString(),
|
||||
@@ -107,4 +106,4 @@ class ValidateCompanyDeletionUseCase extends UseCase<CompanyDeletionValidationRe
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user