Release/1.1.0

README.md

@@ -7,22 +7,14 @@
 
 </h1>
 
-## 너의 날씨는 팀 소개
-
-|[송윤지](https://github.com/somarok)|[장날아](https://github.com/NalaJang)|[전종현](https://github.com/hoogom88)|
-|:----:|:----:|:----:|
-|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/8d3a4028-b02e-42fe-bfd4-080d6b0a774c" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/9b8743f5-ddbf-4ae9-bea2-33a64295e955" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/e7a2e682-c670-4077-aee3-4a12ab995ecb" height="200" width="200">|
-
-|[성종호](https://github.com/SeongJongHo)|[김동혁](https://github.com/KimDonghyeok)|[김민규](https://github.com/gyubit)|
-|:----:|:----:|:----:|
-|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/18e0cc0f-fc3c-40b8-b163-8540fb16bcdc" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/42c7b8c5-c8bb-41ea-b74d-30d03076de8a" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/238e554a-7b88-4424-a124-d74318e65643" height="200" width="200">|
-
-
+<br/>
 
 ## 앱 기획 의도
 
 매일 날씨 확인, 옷 고민 하는데 시간 쏟기 귀찮았던 사람들이 모여서 ‘WeaCo’를 만들었습니다.
 
+<br/>
+
 ## 서비스 소개
 유저의 현재 위치에 대한 날씨 정보 제공과 날씨를 기반으로 OOTD를 공유하는 서비스
 
@@ -31,6 +23,7 @@
   <video autoplay loop src="https://github.com/Team-Weather/ci_test/assets/26239098/9fa97cf6-5e85-4fdc-8166-12ff2a3f5b63" width="400" />
 </div>
 
+<br/>
 
 ## Configuration
 
@@ -39,6 +32,8 @@
 - 라이브러리  
   <img width="65%" src="https://github.com/Team-Weather/ci_test/assets/26239098/f274be3e-eafe-4190-b129-dd5e3857dc44">
 
+<br/>
+
 ## 앱 전체 구조 / 아키텍처 이미지 
 
 ![image](https://github.com/Team-Weather/ci_test/assets/90754590/cfa21382-ffa8-4015-b18e-3120aa640002)
@@ -48,3 +43,15 @@
 ## 전체 플로우 차트
 
 ![image](https://github.com/Team-Weather/ci_test/assets/73895803/e532d7cd-999f-4451-9f18-83f9e7248f77)
+
+<br/>
+
+## 너의 날씨는 팀 소개
+
+|[송윤지](https://github.com/somarok)|[장날아](https://github.com/NalaJang)|[전종현](https://github.com/hoogom88)|
+|:----:|:----:|:----:|
+|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/8d3a4028-b02e-42fe-bfd4-080d6b0a774c" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/9b8743f5-ddbf-4ae9-bea2-33a64295e955" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/e7a2e682-c670-4077-aee3-4a12ab995ecb" height="200" width="200">|
+
+|[성종호](https://github.com/SeongJongHo)|[김동혁](https://github.com/KimDonghyeok)|[김민규](https://github.com/gyubit)|
+|:----:|:----:|:----:|
+|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/18e0cc0f-fc3c-40b8-b163-8540fb16bcdc" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/42c7b8c5-c8bb-41ea-b74d-30d03076de8a" height="200" width="200">|<img src = "https://github.com/Team-Weather/ci_test/assets/32134533/238e554a-7b88-4424-a124-d74318e65643" height="200" width="200">|

lib/core/db/transaction_service.dart

@@ -0,0 +1,3 @@
+abstract interface class TransactionService {
+  Future<bool> run(Function callBack);
+}

lib/core/di/common/common_di_setup.dart

@@ -1,10 +1,12 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:dio/dio.dart';
 import 'package:firebase_storage/firebase_storage.dart';
+import 'package:weaco/core/db/transaction_service.dart';
 import 'package:weaco/core/di/di_setup.dart';
 import 'package:weaco/core/dio/base_dio.dart';
 import 'package:weaco/core/exception/handler/exception_message_handler.dart';
 import 'package:weaco/core/firebase/firebase_auth_service.dart';
+import 'package:weaco/core/firebase/firestore_service.dart';
 import 'package:weaco/core/gps/gps_helper.dart';
 import 'package:weaco/core/hive/hive_wrapper.dart';
 import 'package:weaco/core/path_provider/path_provider_service.dart';
@@ -15,6 +17,11 @@ void commonDiSetup() {
       () => FirebaseFirestore.instance);
   getIt.registerLazySingleton<FirebaseStorage>(() => FirebaseStorage.instance);
   getIt.registerLazySingleton<FirebaseAuthService>(() => FirebaseAuthService());
+  getIt.registerLazySingleton<TransactionService>(
+    () => FirestoreService(
+      fireStore: getIt<FirebaseFirestore>(),
+    ),
+  );
 
   // PathProvider
   getIt.registerLazySingleton<PathProviderService>(() => PathProviderService());

lib/core/di/di_setup.dart

@@ -7,6 +7,7 @@ import 'package:weaco/core/di/user/user_di_setup.dart';
 import 'package:weaco/core/di/weather/weather_di_setup.dart';
 import 'package:weaco/domain/feed/use_case/get_my_page_feeds_use_case.dart';
 import 'package:weaco/domain/feed/use_case/get_recommended_feeds_use_case.dart';
+import 'package:weaco/domain/feed/use_case/get_search_feeds_use_case.dart';
 import 'package:weaco/domain/feed/use_case/remove_my_page_feed_use_case.dart';
 import 'package:weaco/domain/user/repository/user_auth_repository.dart';
 import 'package:weaco/domain/user/use_case/get_my_profile_use_case.dart';
@@ -61,6 +62,7 @@ void diSetup() {
       getDailyLocationWeatherUseCase: getIt<GetDailyLocationWeatherUseCase>(),
       getBackgroundImageListUseCase: getIt<GetBackgroundImageListUseCase>(),
       getRecommendedFeedsUseCase: getIt<GetRecommendedFeedsUseCase>(),
+      getSearchFeedsUseCase: getIt<GetSearchFeedsUseCase>(),
     ),
   );
 

lib/core/di/feed/feed_di_setup.dart

@@ -1,9 +1,11 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:weaco/core/db/transaction_service.dart';
 import 'package:weaco/core/di/di_setup.dart';
 import 'package:weaco/data/feed/data_source/remote_feed_data_source.dart';
 import 'package:weaco/data/feed/data_source/remote_feed_data_source_impl.dart';
 import 'package:weaco/data/feed/repository/feed_repository_impl.dart';
 import 'package:weaco/data/feed/repository/ootd_feed_repository_impl.dart';
+import 'package:weaco/data/user/data_source/remote_user_profile_data_source.dart';
 import 'package:weaco/domain/feed/repository/feed_repository.dart';
 import 'package:weaco/domain/feed/repository/ootd_feed_repository.dart';
 import 'package:weaco/domain/feed/use_case/get_detail_feed_detail_use_case.dart';
@@ -15,7 +17,6 @@ import 'package:weaco/domain/feed/use_case/get_user_page_feeds_use_case.dart';
 import 'package:weaco/domain/feed/use_case/remove_my_page_feed_use_case.dart';
 import 'package:weaco/domain/feed/use_case/save_edit_feed_use_case.dart';
 import 'package:weaco/domain/file/repository/file_repository.dart';
-import 'package:weaco/domain/user/repository/user_profile_repository.dart';
 import 'package:weaco/domain/user/use_case/get_user_profile_use_case.dart';
 import 'package:weaco/domain/weather/use_case/get_daily_location_weather_use_case.dart';
 import 'package:weaco/presentation/ootd_feed/view_model/ootd_feed_view_model.dart';
@@ -30,10 +31,14 @@ void feedDiSetup() {
   // Repository
   getIt.registerLazySingleton<FeedRepository>(() =>
       FeedRepositoryImpl(remoteFeedDataSource: getIt<RemoteFeedDataSource>()));
-  getIt.registerLazySingleton<OotdFeedRepository>(() => OotdFeedRepositoryImpl(
+  getIt.registerLazySingleton<OotdFeedRepository>(
+    () => OotdFeedRepositoryImpl(
       fileRepository: getIt<FileRepository>(),
-      feedRepository: getIt<FeedRepository>(),
-      userProfileRepository: getIt<UserProfileRepository>()));
+      remoteFeedDataSource: getIt<RemoteFeedDataSource>(),
+      remoteUserProfileDataSource: getIt<RemoteUserProfileDataSource>(),
+      firestoreService: getIt<TransactionService>(),
+    ),
+  );
 
   // UseCase
   getIt.registerLazySingleton<GetDetailFeedDetailUseCase>(() =>

lib/core/di/file/file_di_setup.dart

@@ -2,6 +2,7 @@ import 'package:firebase_storage/firebase_storage.dart';
 import 'package:weaco/core/di/di_setup.dart';
 import 'package:weaco/core/firebase/firebase_auth_service.dart';
 import 'package:weaco/core/path_provider/path_provider_service.dart';
+import 'package:weaco/core/util/image_compressor_util.dart';
 import 'package:weaco/data/file/data_source/local/local_file_data_source.dart';
 import 'package:weaco/data/file/data_source/local/local_file_data_source_impl.dart';
 import 'package:weaco/data/file/data_source/remote/remote_file_data_source.dart';
@@ -27,7 +28,7 @@ void fileDiSetup() {
 
   // UseCase
   getIt.registerLazySingleton<SaveImageUseCase>(
-      () => SaveImageUseCase(fileRepository: getIt<FileRepository>()));
+      () => SaveImageUseCase(fileRepository: getIt<FileRepository>(), imageCompressor: ImageCompressorImpl()));
   getIt.registerLazySingleton<GetImageUseCase>(
       () => GetImageUseCase(fileRepository: getIt<FileRepository>()));
 }

lib/core/enum/image_type.dart

@@ -0,0 +1,5 @@
+enum ImageType {
+  origin,
+  cropped,
+  compressed
+}

lib/core/firebase/firestore_dto_mapper.dart

@@ -8,6 +8,7 @@ Feed toFeed({required Map<String, dynamic> json, required String id}) {
   return Feed(
     id: id,
     imagePath: json['image_path'],
+    thumbnailImagePath: json['thumbnail_image_path'] ?? json['image_path'],
     userEmail: json['user_email'],
     description: json['description'],
     weather: Weather.fromJson(json['weather']),
@@ -23,6 +24,7 @@ Feed toFeed({required Map<String, dynamic> json, required String id}) {
 Map<String, dynamic> toFeedDto({required Feed feed}) {
   return {
     'image_path': feed.imagePath,
+    'thumbnail_image_path': feed.thumbnailImagePath,
     'user_email': feed.userEmail,
     'description': feed.description,
     'weather': feed.weather.toJson(),

lib/core/firebase/firestore_service.dart

@@ -0,0 +1,22 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:weaco/core/db/transaction_service.dart';
+
+class FirestoreService implements TransactionService {
+  final FirebaseFirestore _fireStore;
+
+  const FirestoreService({
+    required FirebaseFirestore fireStore,
+  }) : _fireStore = fireStore;
+
+  @override
+  Future<bool> run(Function callBack) async {
+    return _fireStore.runTransaction<bool>((transaction) async {
+      return await callBack(transaction);
+    }).then(
+      (value) => true,
+      onError: (e) {
+        throw Exception('피드 업로드에 실패 하였습니다.');
+      },
+    );
+  }
+}

lib/core/path_provider/path_provider_service.dart

@@ -2,6 +2,6 @@ import 'package:path_provider/path_provider.dart';
 
 class PathProviderService {
   Future<String> getCacheDirectory() async {
-    return (await getApplicationCacheDirectory()).path;
+    return (await getApplicationDocumentsDirectory()).path;
   }
 }

lib/core/util/image_compressor_util.dart

@@ -0,0 +1,16 @@
+import 'dart:io';
+import 'package:image/image.dart' as image;
+import 'package:weaco/domain/common/util/image_compressor.dart';
+
+class ImageCompressorImpl implements ImageCompressor {
+  int width= 1000;
+  int height = 1000 ~/ 9 * 16;
+
+  @override
+  Future<List<int>> compressImage({required File file}) async {
+    image.Image originImage = (await image.decodeImageFile(file.path))!;
+    image.Image resizedImage = image.copyResize(originImage, width: width, height: height);
+    List<int> compressedResizedImage = image.encodeJpg(resizedImage, quality: 80);
+    return compressedResizedImage;
+  }
+}

lib/data/feed/data_source/remote_feed_data_source.dart

@@ -1,11 +1,15 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:weaco/domain/feed/model/feed.dart';
 import 'package:weaco/domain/weather/model/daily_location_weather.dart';
 
 abstract interface class RemoteFeedDataSource {
   /// OOTD 피드 작성 성공 시 : 피드 업로드 요청(Feed) -> / 업로드 완료(bool) ← 파베
   /// OOTD 편집 완료 후 [상세 페이지]:  위와 동일.
   /// OOTD 편집 완료 후 [마이 페이지]: 위와 동일.*피드 업데이트
-  Future<bool> saveFeed({required Feed feed});
+  Future<bool> saveFeed({
+    required Transaction transaction,
+    required Feed feed,
+  });
 
   /// OOTD 피드 [상세 페이지] : 피드 데이터 요청 (id) -> 파베 / 피드 데이터 반환(json) ← 파베
   Future<Feed> getFeed({required String id});
@@ -18,17 +22,19 @@ abstract interface class RemoteFeedDataSource {
   });
 
   /// [마이페이지] 피드 삭제: 피드 삭제 요청(id) -> 파베/ 삭제 완료 (bool) from FB
-  Future<bool> deleteFeed({required String id});
+  Future<bool> deleteFeed({
+    required Transaction transaction,
+    required String id,
+  });
 
   /// [홈 화면] 하단 OOTD 추천 목록:
   ///
   /// 유저의 위치와 기온을 기반으로 피드 목록을 불러옵니다.
   /// @param city: 유저 위치의 도시명
   /// @param temperature: 날씨 온도
-  Future<List<Feed>> getRecommendedFeedList({
-    required DailyLocationWeather dailyLocationWeather,
-    DateTime? createdAt
-  });
+  Future<List<Feed>> getRecommendedFeedList(
+      {required DailyLocationWeather dailyLocationWeather,
+      DateTime? createdAt});
 
   /// [검색 페이지] 피드 검색:
   ///

lib/data/feed/data_source/remote_feed_data_source_impl.dart

@@ -14,23 +14,22 @@ class RemoteFeedDataSourceImpl implements RemoteFeedDataSource {
 
   /// OOTD 피드 작성 또는 편집 후 저장
   @override
-  Future<bool> saveFeed({required Feed feed}) async {
+  Future<bool> saveFeed({
+    required Transaction transaction,
+    required Feed feed,
+  }) async {
     final feedDto = toFeedDto(feed: feed);
 
-    // 피드를 수정 할 경우
     if (feed.id != null) {
-      return await _fireStore
-          .collection('feeds')
-          .doc(feed.id)
-          .set(feedDto)
-          .then((value) => true);
+      // 피드를 수정할 경우
+      final feedDocRef = _fireStore.collection('feeds').doc(feed.id);
+      transaction.set(feedDocRef, feedDto);
+    } else {
+      // 새 피드를 추가할 경우
+      final feedDocRef = _fireStore.collection('feeds').doc();
+      transaction.set(feedDocRef, feedDto);
     }
-
-    // 새 피드를 저장 할 경우
-    return await _fireStore
-        .collection('feeds')
-        .add(feedDto)
-        .then((value) => true);
+    return true;
   }
 
   /// [OOTD 피드 상세 페이지]:
@@ -75,11 +74,23 @@ class RemoteFeedDataSourceImpl implements RemoteFeedDataSource {
   /// [마이페이지] 피드 삭제
   /// soft delete 처리
   @override
-  Future<bool> deleteFeed({required String id}) async {
-    await _fireStore
-        .collection('feeds')
-        .doc(id)
-        .update({'deleted_at': Timestamp.fromDate(DateTime.now())});
+  Future<bool> deleteFeed({
+    required Transaction transaction,
+    required String id,
+  }) async {
+    final originalFeedDocRef = _fireStore.collection('feeds').doc(id);
+    final originalFeedDoc = await originalFeedDocRef.get();
+
+    if (originalFeedDoc.exists) {
+      final feed = toFeed(json: originalFeedDoc.data()!, id: id);
+      final deletedFeed = feed.copyWith(deletedAt: DateTime.now());
+
+      transaction.update(
+        originalFeedDocRef,
+        toFeedDto(feed: deletedFeed),
+      );
+    }
+
     return true;
   }
 

lib/data/feed/repository/feed_repository_impl.dart

@@ -10,16 +10,6 @@ class FeedRepositoryImpl implements FeedRepository {
     required this.remoteFeedDataSource,
   });
 
-  @override
-  Future<bool> saveFeed({required Feed editedFeed}) {
-    return remoteFeedDataSource.saveFeed(feed: editedFeed);
-  }
-
-  @override
-  Future<bool> deleteFeed({required String id}) async {
-    return await remoteFeedDataSource.deleteFeed(id: id);
-  }
-
   /// 피드의 id 값을 전달 하여 Firebase 내의 해당 피드를 가져 와야 한다.
   /// GetDetailFeedDetailUseCase에서 사용
   /// @param id: 피드 id
@@ -59,7 +49,7 @@ class FeedRepositoryImpl implements FeedRepository {
   }) async {
     return await remoteFeedDataSource.getRecommendedFeedList(
       dailyLocationWeather: dailyLocationWeather,
-      createdAt: createdAt
+      createdAt: createdAt,
     );
   }