[PDA-45] fix: QA 수정

PLADI-ALM · Dec 5, 2023 · fe94814 · fe94814
1 parent 1fbb19a
commit fe94814
Show file tree

Hide file tree

Showing 13 changed files with 187 additions and 141 deletions.
diff --git a/android/fastlane/report.xml b/android/fastlane/report.xml
@@ -5,27 +5,27 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.003909">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000238">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000789">
+      <testcase classname="fastlane.lanes" name="1: Switch to android increase_version lane" time="0.000109">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="148.642411">
+      <testcase classname="fastlane.lanes" name="2: flutter build appbundle" time="104.87781">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="30.671689">
+      <testcase classname="fastlane.lanes" name="3: upload_to_play_store" time="46.513868">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="4: slack" time="0.519376">
+      <testcase classname="fastlane.lanes" name="4: slack" time="0.544567">
 
       </testcase>
 

diff --git a/ios/Runner.app.dSYM.zip b/ios/Runner.app.dSYM.zip
diff --git a/ios/Runner.ipa b/ios/Runner.ipa
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -505,7 +505,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -524,7 +524,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -541,7 +541,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = 643M65W7HH;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -669,7 +669,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;
@@ -703,7 +703,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 643M65W7HH;
 				ENABLE_BITCODE = NO;

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -29,7 +29,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>11</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>

diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
@@ -5,74 +5,72 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.000186">
+      <testcase classname="fastlane.lanes" name="00: default_platform" time="0.00054">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="01: match" time="20.099446">
+      <testcase classname="fastlane.lanes" name="01: match" time="440.936291">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000186">
+      <testcase classname="fastlane.lanes" name="02: setup_ci" time="0.000263">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="03: get_certificates" time="4.735742">
+      <testcase classname="fastlane.lanes" name="03: get_certificates" time="4.333199">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="8.098552">
+      <testcase classname="fastlane.lanes" name="04: get_provisioning_profile" time="4.176982">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="05: cocoapods" time="1.964271">
+      <testcase classname="fastlane.lanes" name="05: cocoapods" time="2.177938">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="06: increment_version_number" time="0.279607">
+      <testcase classname="fastlane.lanes" name="06: increment_version_number" time="2.910989">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="6.164429">
+      <testcase classname="fastlane.lanes" name="07: latest_testflight_build_number" time="6.332043">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.224535">
+      <testcase classname="fastlane.lanes" name="08: increment_build_number" time="0.210178">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="09: build_app" time="92.593177">
+      <testcase classname="fastlane.lanes" name="09: build_app" time="131.97139">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="377.456874">
+      <testcase classname="fastlane.lanes" name="10: upload_to_testflight" time="469.96003">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="11: get_version_number" time="0.084375">
+      <testcase classname="fastlane.lanes" name="11: get_version_number" time="0.031575">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000501">
+      <testcase classname="fastlane.lanes" name="12: Switch to ios send_slack_test lane" time="0.000218">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="13: slack" time="0.90826">
-
-          <failure message="/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/actions/actions_helper.rb:67:in `execute_action&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:255:in `block in execute_action&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:229:in `chdir&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:229:in `execute_action&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing&apos;&#10;Fastfile:135:in `block (2 levels) in parsing_binding&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/lane.rb:41:in `call&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:204:in `try_switch_to_lane&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:146:in `trigger_action_by_name&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing&apos;&#10;Fastfile:97:in `block (2 levels) in parsing_binding&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/lane.rb:41:in `call&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:49:in `block in execute&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:45:in `chdir&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/runner.rb:45:in `execute&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/lane_manager.rb:47:in `cruise_lane&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/commands_generator.rb:110:in `block (2 levels) in run&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/command.rb:187:in `call&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/command.rb:157:in `run&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/runner.rb:444:in `run_active_command&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in `run!&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/commander-4.6.0/lib/commander/delegates.rb:18:in `run!&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/commands_generator.rb:354:in `run&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/commands_generator.rb:43:in `start&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/fastlane/lib/fastlane/cli_tools_distributor.rb:123:in `take_off&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems/fastlane-2.217.0/bin/fastlane:23:in `&lt;top (required)&gt;&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/bin/fastlane:25:in `load&apos;&#10;/Users/yoosang/.rbenv/versions/3.2.2/bin/fastlane:25:in `&lt;main&gt;&apos;&#10;&#10;Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile, this is usually caused by a misspelled or changed group/channel name or an expired SLACK_URL" />
+      <testcase classname="fastlane.lanes" name="13: slack" time="0.504566">
 
       </testcase>
 

diff --git a/lib/Model/network/api_manager.dart b/lib/Model/network/api_manager.dart
@@ -129,6 +129,7 @@ class APIManager {
   void deleteToken() {
     storage.delete(key: refreshTokenKey);
     storage.delete(key: accessTokenKey);
+    isAdmin = false;
   }
 
   Future<bool> checkToken() async {

diff --git a/lib/Presenter/booking/car_service.dart b/lib/Presenter/booking/car_service.dart
@@ -9,7 +9,7 @@ import '../../Model/network/api_manager.dart';
 class CarService {
   final carURL = '/cars';
   final carBookingHistoryURL = '/bookings/cars';
-  final carAdminBookingHistoryURL = '/admin/bookings/cars';
+  final carAdminBookingHistoryURL = '/admin/bookings/cars&size';
 
   DateTime? startDate;
   DateTime? startTime;
@@ -30,14 +30,15 @@ class CarService {
     String endTimeStr = '';
 
     if (startDate != null && startTime != null) {
-      startTimeStr = '${DateFormat('yyyy-MM-dd').format(startDate!)} ${DateFormat('HH:mm').format(startTime!)}';
+      startTimeStr =
+          '${DateFormat('yyyy-MM-dd').format(startDate!)} ${DateFormat('HH:mm').format(startTime!)}';
     }
 
     if (endDate != null && endTime != null) {
-      endTimeStr = '${DateFormat('yyyy-MM-dd').format(endDate!)} ${DateFormat('HH:mm').format(endTime!)}';
+      endTimeStr =
+          '${DateFormat('yyyy-MM-dd').format(endDate!)} ${DateFormat('HH:mm').format(endTime!)}';
     }
 
-
     final response = await APIManager().request(
         RequestType.get,
         carURL,
@@ -149,29 +150,22 @@ class CarService {
   }
 
   /// 예약된 날짜, 시간의 예약 내역 조회
-  Future<dynamic> getBookedDetailInfo(int resourceId, DateTime selectedDate, int selectedTime) async {
+  Future<dynamic> getBookedDetailInfo(
+      int resourceId, DateTime selectedDate, int selectedTime) async {
     String date = DateFormat('yyyy-MM-dd').format(selectedDate);
     String time = (selectedTime < 10) ? '0$selectedTime' : '$selectedTime';
 
-    final response = await APIManager().request(
-        RequestType.get,
-        '$carURL/$resourceId/booking',
-        null,
-        {'dateTime': '$date $time'},
-        null);
+    final response = await APIManager().request(RequestType.get,
+        '$carURL/$resourceId/booking', null, {'dateTime': '$date $time'}, null);
     return response;
   }
 
   /// 예약된 날짜의 모든 예약 내역 조회
   Future<dynamic> getBookedInfoList(int carId, DateTime selectedDate) async {
     String date = DateFormat('yyyy-MM-dd').format(selectedDate);
 
-    final response = await APIManager().request(
-        RequestType.get,
-        '$carURL/$carId/booking-info',
-        null,
-        {'date': date},
-        null);
+    final response = await APIManager().request(RequestType.get,
+        '$carURL/$carId/booking-info', null, {'date': date}, null);
     return response;
   }
 
@@ -182,25 +176,31 @@ class CarService {
         RequestType.get,
         '$carURL/$carId/booking-time',
         null,
-        {'date': selectedDate,},
+        {
+          'date': selectedDate,
+        },
         null);
     return response;
   }
 
-  Future<dynamic> getBookedDateList(int carId, DateTime selectedMonth, DateTime? selectedDay) async {
+  Future<dynamic> getBookedDateList(
+      int carId, DateTime selectedMonth, DateTime? selectedDay) async {
     String selectedMonthStr = DateFormat('yyyy-MM').format(selectedMonth);
 
     final response = await APIManager().request(
         RequestType.get,
         '$carURL/$carId/booking-state',
         null,
-        {'month': selectedMonthStr,},
+        {
+          'month': selectedMonthStr,
+        },
         null);
     return response;
   }
 
   /// 차량 예약
-  Future<dynamic> bookCar(int carId, DateTime startDate, DateTime endDate, String memo) async {
+  Future<dynamic> bookCar(
+      int carId, DateTime startDate, DateTime endDate, String memo) async {
     String startDateStr = DateFormat('yyyy-MM-dd HH').format(startDate);
     String endDateStr = DateFormat('yyyy-MM-dd HH').format(endDate);
 
@@ -211,8 +211,8 @@ class CarService {
     );
 
     try {
-      final response = await APIManager().request(RequestType.post,
-          '$carURL/$carId', null, null, body.toJson());
+      final response = await APIManager().request(
+          RequestType.post, '$carURL/$carId', null, null, body.toJson());
 
       if (response != null) {
         final data = GeneralModel.fromJson(response);
@@ -224,7 +224,7 @@ class CarService {
       final response = e.response;
       if (response != null) {
         final error =
-        GeneralModel.fromJson(response.data as Map<String, dynamic>);
+            GeneralModel.fromJson(response.data as Map<String, dynamic>);
         return error.message;
       }
     }

diff --git a/lib/Presenter/booking/resource_service.dart b/lib/Presenter/booking/resource_service.dart
@@ -30,11 +30,13 @@ class ResourceService {
     String endTimeStr = '';
 
     if (startDate != null && startTime != null) {
-      startTimeStr = '${DateFormat('yyyy-MM-dd').format(startDate!)} ${DateFormat('HH:mm').format(startTime!)}';
+      startTimeStr =
+          '${DateFormat('yyyy-MM-dd').format(startDate!)} ${DateFormat('HH:mm').format(startTime!)}';
     }
 
     if (endDate != null && endTime != null) {
-      endTimeStr = '${DateFormat('yyyy-MM-dd').format(endDate!)} ${DateFormat('HH:mm').format(endTime!)}';
+      endTimeStr =
+          '${DateFormat('yyyy-MM-dd').format(endDate!)} ${DateFormat('HH:mm').format(endTime!)}';
     }
 
     final response = await APIManager().request(
@@ -72,19 +74,24 @@ class ResourceService {
         RequestType.get,
         '$resourceURL/$resourceId/booking-time',
         null,
-        {'date': selectedDate,},
+        {
+          'date': selectedDate,
+        },
         null);
     return response;
   }
 
-  Future<dynamic> getBookedDateList(int resourceId, DateTime selectedMonth, DateTime? selectedDay) async {
+  Future<dynamic> getBookedDateList(
+      int resourceId, DateTime selectedMonth, DateTime? selectedDay) async {
     String selectedMonthStr = DateFormat('yyyy-MM').format(selectedMonth);
 
     final response = await APIManager().request(
         RequestType.get,
         '$resourceURL/$resourceId/booking-state',
         null,
-        {'month': selectedMonthStr,},
+        {
+          'month': selectedMonthStr,
+        },
         null);
     return response;
   }
@@ -105,7 +112,8 @@ class ResourceService {
   }
 
   /// 예약된 날짜, 시간의 예약 내역 조회
-  Future<dynamic> getBookedDetailInfo(int resourceId, DateTime selectedDate, int selectedTime) async {
+  Future<dynamic> getBookedDetailInfo(
+      int resourceId, DateTime selectedDate, int selectedTime) async {
     String date = DateFormat('yyyy-MM-dd').format(selectedDate);
     String time = (selectedTime < 10) ? '0$selectedTime' : '$selectedTime';
 
@@ -119,15 +127,12 @@ class ResourceService {
   }
 
   /// 예약된 날짜의 모든 예약 내역 조회
-  Future<dynamic> getBookedInfoList(int resourceId, DateTime selectedDate) async {
+  Future<dynamic> getBookedInfoList(
+      int resourceId, DateTime selectedDate) async {
     String date = DateFormat('yyyy-MM-dd').format(selectedDate);
 
-    final response = await APIManager().request(
-        RequestType.get,
-        '$resourceURL/$resourceId/booking-info',
-        null,
-        {'date': date},
-        null);
+    final response = await APIManager().request(RequestType.get,
+        '$resourceURL/$resourceId/booking-info', null, {'date': date}, null);
     return response;
   }
 
@@ -164,8 +169,9 @@ class ResourceService {
 
   // 장비 예약 목록 조회
   Future<dynamic> getResourceBookingHistoryList(bool isAdmin) async {
-    String url =
-        isAdmin ? resourceAdminBookingHistoryURL : resourceBookingHistoryURL;
+    String url = isAdmin
+        ? "$resourceAdminBookingHistoryURL?23size=200"
+        : "$resourceBookingHistoryURL?size=200";
     final response =
         await APIManager().request(RequestType.get, url, null, null, null);
     return response;