From bdfb08f092bb32bf19e71cc45ece54ce182138f0 Mon Sep 17 00:00:00 2001 From: Jean Jacques Avril Date: Sat, 4 Jan 2025 15:10:21 +0000 Subject: [PATCH] refactor --- backend-dart/lib/application/repository/provider.dart | 2 +- .../{persistence => data}/database_provider.dart | 2 +- .../{persistence => data}/db/client.dart | 0 .../infrastructure/{persistence => data}/db/model.dart | 0 .../{persistence => data}/db/prisma.dart | 0 .../mapper/project_dbo_mapper.dart | 4 ++-- .../mapper/project_task_dbo_mapper.dart | 4 ++-- .../mapper/time_entry_dbo_mapper.dart | 4 ++-- .../{persistence => data}/mapper/user_dbo_mapper.dart | 4 ++-- .../{persistence => data}/prisma_database.dart | 10 +++++----- .../prisma_project_data_source.dart | 8 ++++---- .../prisma_project_task_data_source.dart | 8 ++++---- .../prisma_time_entry_data_source.dart | 8 ++++---- .../{persistence => data}/prisma_user_data_source.dart | 6 +++--- 14 files changed, 30 insertions(+), 30 deletions(-) rename backend-dart/lib/infrastructure/{persistence => data}/database_provider.dart (72%) rename backend-dart/lib/infrastructure/{persistence => data}/db/client.dart (100%) rename backend-dart/lib/infrastructure/{persistence => data}/db/model.dart (100%) rename backend-dart/lib/infrastructure/{persistence => data}/db/prisma.dart (100%) rename backend-dart/lib/infrastructure/{persistence => data}/mapper/project_dbo_mapper.dart (92%) rename backend-dart/lib/infrastructure/{persistence => data}/mapper/project_task_dbo_mapper.dart (92%) rename backend-dart/lib/infrastructure/{persistence => data}/mapper/time_entry_dbo_mapper.dart (94%) rename backend-dart/lib/infrastructure/{persistence => data}/mapper/user_dbo_mapper.dart (90%) rename backend-dart/lib/infrastructure/{persistence => data}/prisma_database.dart (69%) rename backend-dart/lib/infrastructure/{persistence => data}/prisma_project_data_source.dart (93%) rename backend-dart/lib/infrastructure/{persistence => data}/prisma_project_task_data_source.dart (93%) rename backend-dart/lib/infrastructure/{persistence => data}/prisma_time_entry_data_source.dart (94%) rename backend-dart/lib/infrastructure/{persistence => data}/prisma_user_data_source.dart (95%) diff --git a/backend-dart/lib/application/repository/provider.dart b/backend-dart/lib/application/repository/provider.dart index 4e7843f..b687b72 100644 --- a/backend-dart/lib/application/repository/provider.dart +++ b/backend-dart/lib/application/repository/provider.dart @@ -8,7 +8,7 @@ import 'package:backend_dart/domain/repository/project_repository.dart'; import 'package:backend_dart/domain/repository/project_task_repository.dart'; import 'package:backend_dart/domain/repository/time_entry_repository.dart'; import 'package:backend_dart/domain/repository/user_repository.dart'; -import 'package:backend_dart/infrastructure/persistence/database_provider.dart'; +import 'package:backend_dart/infrastructure/data/database_provider.dart'; import 'package:riverpod/riverpod.dart'; final userRepoProvider = Provider((ref) { diff --git a/backend-dart/lib/infrastructure/persistence/database_provider.dart b/backend-dart/lib/infrastructure/data/database_provider.dart similarity index 72% rename from backend-dart/lib/infrastructure/persistence/database_provider.dart rename to backend-dart/lib/infrastructure/data/database_provider.dart index 5737c5e..3653a01 100644 --- a/backend-dart/lib/infrastructure/persistence/database_provider.dart +++ b/backend-dart/lib/infrastructure/data/database_provider.dart @@ -1,4 +1,4 @@ -import 'package:backend_dart/infrastructure/persistence/prisma_database.dart'; +import 'package:backend_dart/infrastructure/data/prisma_database.dart'; import 'package:riverpod/riverpod.dart'; final databaseProvider = Provider((ref) { diff --git a/backend-dart/lib/infrastructure/persistence/db/client.dart b/backend-dart/lib/infrastructure/data/db/client.dart similarity index 100% rename from backend-dart/lib/infrastructure/persistence/db/client.dart rename to backend-dart/lib/infrastructure/data/db/client.dart diff --git a/backend-dart/lib/infrastructure/persistence/db/model.dart b/backend-dart/lib/infrastructure/data/db/model.dart similarity index 100% rename from backend-dart/lib/infrastructure/persistence/db/model.dart rename to backend-dart/lib/infrastructure/data/db/model.dart diff --git a/backend-dart/lib/infrastructure/persistence/db/prisma.dart b/backend-dart/lib/infrastructure/data/db/prisma.dart similarity index 100% rename from backend-dart/lib/infrastructure/persistence/db/prisma.dart rename to backend-dart/lib/infrastructure/data/db/prisma.dart diff --git a/backend-dart/lib/infrastructure/persistence/mapper/project_dbo_mapper.dart b/backend-dart/lib/infrastructure/data/mapper/project_dbo_mapper.dart similarity index 92% rename from backend-dart/lib/infrastructure/persistence/mapper/project_dbo_mapper.dart rename to backend-dart/lib/infrastructure/data/mapper/project_dbo_mapper.dart index 8cf90ad..5b460e8 100644 --- a/backend-dart/lib/infrastructure/persistence/mapper/project_dbo_mapper.dart +++ b/backend-dart/lib/infrastructure/data/mapper/project_dbo_mapper.dart @@ -1,8 +1,8 @@ import 'package:backend_dart/common/extensions.dart'; import 'package:backend_dart/domain/entities/project.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/mapper/project_task_dbo_mapper.dart b/backend-dart/lib/infrastructure/data/mapper/project_task_dbo_mapper.dart similarity index 92% rename from backend-dart/lib/infrastructure/persistence/mapper/project_task_dbo_mapper.dart rename to backend-dart/lib/infrastructure/data/mapper/project_task_dbo_mapper.dart index 05fc638..77dffe2 100644 --- a/backend-dart/lib/infrastructure/persistence/mapper/project_task_dbo_mapper.dart +++ b/backend-dart/lib/infrastructure/data/mapper/project_task_dbo_mapper.dart @@ -1,8 +1,8 @@ import 'package:backend_dart/common/extensions.dart'; import 'package:backend_dart/domain/entities/project_task.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/mapper/time_entry_dbo_mapper.dart b/backend-dart/lib/infrastructure/data/mapper/time_entry_dbo_mapper.dart similarity index 94% rename from backend-dart/lib/infrastructure/persistence/mapper/time_entry_dbo_mapper.dart rename to backend-dart/lib/infrastructure/data/mapper/time_entry_dbo_mapper.dart index 4ef9d92..c2646e3 100644 --- a/backend-dart/lib/infrastructure/persistence/mapper/time_entry_dbo_mapper.dart +++ b/backend-dart/lib/infrastructure/data/mapper/time_entry_dbo_mapper.dart @@ -1,8 +1,8 @@ import 'package:backend_dart/common/extensions.dart'; import 'package:backend_dart/domain/entities/time_entry.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/mapper/user_dbo_mapper.dart b/backend-dart/lib/infrastructure/data/mapper/user_dbo_mapper.dart similarity index 90% rename from backend-dart/lib/infrastructure/persistence/mapper/user_dbo_mapper.dart rename to backend-dart/lib/infrastructure/data/mapper/user_dbo_mapper.dart index d5ca68f..482817b 100644 --- a/backend-dart/lib/infrastructure/persistence/mapper/user_dbo_mapper.dart +++ b/backend-dart/lib/infrastructure/data/mapper/user_dbo_mapper.dart @@ -2,8 +2,8 @@ import 'package:backend_dart/common/extensions.dart'; import 'package:backend_dart/common/secure_hash.dart'; import 'package:backend_dart/domain/entities/user.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/prisma_database.dart b/backend-dart/lib/infrastructure/data/prisma_database.dart similarity index 69% rename from backend-dart/lib/infrastructure/persistence/prisma_database.dart rename to backend-dart/lib/infrastructure/data/prisma_database.dart index 09913ae..0aafd03 100644 --- a/backend-dart/lib/infrastructure/persistence/prisma_database.dart +++ b/backend-dart/lib/infrastructure/data/prisma_database.dart @@ -2,11 +2,11 @@ import 'package:backend_dart/domain/data/database.dart'; import 'package:backend_dart/domain/data/project_data_source.dart'; import 'package:backend_dart/domain/data/project_task_data_source.dart'; import 'package:backend_dart/domain/data/time_entry_data_source.dart'; -import 'package:backend_dart/infrastructure/persistence/db/client.dart'; -import 'package:backend_dart/infrastructure/persistence/prisma_project_data_source.dart'; -import 'package:backend_dart/infrastructure/persistence/prisma_project_task_data_source.dart'; -import 'package:backend_dart/infrastructure/persistence/prisma_time_entry_data_source.dart'; -import 'package:backend_dart/infrastructure/persistence/prisma_user_data_source.dart'; +import 'package:backend_dart/infrastructure/data/db/client.dart'; +import 'package:backend_dart/infrastructure/data/prisma_project_data_source.dart'; +import 'package:backend_dart/infrastructure/data/prisma_project_task_data_source.dart'; +import 'package:backend_dart/infrastructure/data/prisma_time_entry_data_source.dart'; +import 'package:backend_dart/infrastructure/data/prisma_user_data_source.dart'; class PrismaDatabase implements IDatabase { final prisma = PrismaClient(); diff --git a/backend-dart/lib/infrastructure/persistence/prisma_project_data_source.dart b/backend-dart/lib/infrastructure/data/prisma_project_data_source.dart similarity index 93% rename from backend-dart/lib/infrastructure/persistence/prisma_project_data_source.dart rename to backend-dart/lib/infrastructure/data/prisma_project_data_source.dart index 6103aaa..80ae522 100644 --- a/backend-dart/lib/infrastructure/persistence/prisma_project_data_source.dart +++ b/backend-dart/lib/infrastructure/data/prisma_project_data_source.dart @@ -3,10 +3,10 @@ import 'package:backend_dart/domain/data/project_data_source.dart'; import 'package:backend_dart/domain/entities/project.dart'; import 'package:backend_dart/domain/errors/app_error.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/client.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; -import 'package:backend_dart/infrastructure/persistence/mapper/project_dbo_mapper.dart'; +import 'package:backend_dart/infrastructure/data/db/client.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/mapper/project_dbo_mapper.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; import 'package:uuid/uuid.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/prisma_project_task_data_source.dart b/backend-dart/lib/infrastructure/data/prisma_project_task_data_source.dart similarity index 93% rename from backend-dart/lib/infrastructure/persistence/prisma_project_task_data_source.dart rename to backend-dart/lib/infrastructure/data/prisma_project_task_data_source.dart index 392a5b5..db49956 100644 --- a/backend-dart/lib/infrastructure/persistence/prisma_project_task_data_source.dart +++ b/backend-dart/lib/infrastructure/data/prisma_project_task_data_source.dart @@ -3,10 +3,10 @@ import 'package:backend_dart/domain/data/project_task_data_source.dart'; import 'package:backend_dart/domain/entities/project_task.dart'; import 'package:backend_dart/domain/errors/app_error.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/client.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; -import 'package:backend_dart/infrastructure/persistence/mapper/project_task_dbo_mapper.dart'; +import 'package:backend_dart/infrastructure/data/db/client.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/mapper/project_task_dbo_mapper.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; import 'package:uuid/uuid.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/prisma_time_entry_data_source.dart b/backend-dart/lib/infrastructure/data/prisma_time_entry_data_source.dart similarity index 94% rename from backend-dart/lib/infrastructure/persistence/prisma_time_entry_data_source.dart rename to backend-dart/lib/infrastructure/data/prisma_time_entry_data_source.dart index bfb4f97..6690160 100644 --- a/backend-dart/lib/infrastructure/persistence/prisma_time_entry_data_source.dart +++ b/backend-dart/lib/infrastructure/data/prisma_time_entry_data_source.dart @@ -3,10 +3,10 @@ import 'package:backend_dart/domain/data/time_entry_data_source.dart'; import 'package:backend_dart/domain/entities/time_entry.dart'; import 'package:backend_dart/domain/errors/app_error.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/client.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; -import 'package:backend_dart/infrastructure/persistence/mapper/time_entry_dbo_mapper.dart'; +import 'package:backend_dart/infrastructure/data/db/client.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/mapper/time_entry_dbo_mapper.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; import 'package:uuid/uuid.dart'; diff --git a/backend-dart/lib/infrastructure/persistence/prisma_user_data_source.dart b/backend-dart/lib/infrastructure/data/prisma_user_data_source.dart similarity index 95% rename from backend-dart/lib/infrastructure/persistence/prisma_user_data_source.dart rename to backend-dart/lib/infrastructure/data/prisma_user_data_source.dart index f5c44d6..be2ac50 100755 --- a/backend-dart/lib/infrastructure/persistence/prisma_user_data_source.dart +++ b/backend-dart/lib/infrastructure/data/prisma_user_data_source.dart @@ -3,9 +3,9 @@ import 'package:backend_dart/domain/data/user_data_source.dart'; import 'package:backend_dart/domain/entities/user.dart'; import 'package:backend_dart/domain/errors/app_error.dart'; import 'package:backend_dart/domain/errors/error.dart'; -import 'package:backend_dart/infrastructure/persistence/db/model.dart'; -import 'package:backend_dart/infrastructure/persistence/db/prisma.dart'; -import 'package:backend_dart/infrastructure/persistence/mapper/user_dbo_mapper.dart'; +import 'package:backend_dart/infrastructure/data/db/model.dart'; +import 'package:backend_dart/infrastructure/data/db/prisma.dart'; +import 'package:backend_dart/infrastructure/data/mapper/user_dbo_mapper.dart'; import 'package:fpdart/fpdart.dart'; import 'package:orm/orm.dart'; import 'package:uuid/uuid.dart';