feat: [FC-0047] Calendar synchronization (#466)

* feat: calendar synchronization flow * fix: address feedback * fix: address feedback * fix: address feedback * fix: adress feedback * fix: address feedback * fix: address feedback
openedx · Jul 18, 2024 · 9c18b30 · 9c18b30
1 parent 1e5ab71
commit 9c18b30
Show file tree

Hide file tree

Showing 60 changed files with 2,365 additions and 1,191 deletions.
diff --git a/Core/Core.xcodeproj/project.pbxproj b/Core/Core.xcodeproj/project.pbxproj
@@ -14,8 +14,10 @@
 		021D924828DC860C00ACC565 /* Data_UserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021D924728DC860C00ACC565 /* Data_UserProfile.swift */; };
 		021D925028DC89D100ACC565 /* UserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021D924F28DC89D100ACC565 /* UserProfile.swift */; };
 		021D925728DCF12900ACC565 /* AlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021D925628DCF12900ACC565 /* AlertView.swift */; };
+		022020462C11BB2200D15795 /* Data_CourseDates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022020452C11BB2200D15795 /* Data_CourseDates.swift */; };
 		02280F5B294B4E6F0032823A /* Connectivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02280F5A294B4E6F0032823A /* Connectivity.swift */; };
 		02284C182A3B1AE00007117F /* UIApplicationExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02284C172A3B1AE00007117F /* UIApplicationExtension.swift */; };
+		02286D162C106393005EEC8D /* CourseDates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02286D152C106393005EEC8D /* CourseDates.swift */; };
 		022C64E429AE0191000F532B /* TextWithUrls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022C64E329AE0191000F532B /* TextWithUrls.swift */; };
 		0231CDBE2922422D00032416 /* CSSInjector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0231CDBD2922422D00032416 /* CSSInjector.swift */; };
 		0233D56F2AF13EB200BAC8BD /* StarRatingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0233D56E2AF13EB200BAC8BD /* StarRatingView.swift */; };
@@ -74,6 +76,7 @@
 		02A4833829B8A8F900D33F33 /* CoreDataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 02A4833629B8A8F800D33F33 /* CoreDataModel.xcdatamodeld */; };
 		02A4833A29B8A9AB00D33F33 /* DownloadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A4833929B8A9AB00D33F33 /* DownloadManager.swift */; };
 		02A4833C29B8C57800D33F33 /* DownloadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A4833B29B8C57800D33F33 /* DownloadView.swift */; };
+		02A8C5812C05DBB4004B91FF /* Data_EnrollmentsStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A8C5802C05DBB4004B91FF /* Data_EnrollmentsStatus.swift */; };
 		02AFCC182AEFDB24000360F0 /* ThirdPartyMailClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02AFCC172AEFDB24000360F0 /* ThirdPartyMailClient.swift */; };
 		02AFCC1A2AEFDC18000360F0 /* ThirdPartyMailer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02AFCC192AEFDC18000360F0 /* ThirdPartyMailer.swift */; };
 		02B2B594295C5C7A00914876 /* Thread.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B2B593295C5C7A00914876 /* Thread.swift */; };
@@ -87,6 +90,9 @@
 		02E224DB2BB76B3E00EF1ADB /* DynamicOffsetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02E224DA2BB76B3E00EF1ADB /* DynamicOffsetView.swift */; };
 		02E225B0291D29EB0067769A /* UrlExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02E225AF291D29EB0067769A /* UrlExtension.swift */; };
 		02E93F852AEBAEBC006C4750 /* AppReviewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02E93F842AEBAEBC006C4750 /* AppReviewViewModel.swift */; };
+		02EBC7572C19DCDB00BE182C /* SyncStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02EBC7562C19DCDB00BE182C /* SyncStatus.swift */; };
+		02EBC7592C19DE1100BE182C /* CalendarManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02EBC7582C19DE1100BE182C /* CalendarManagerProtocol.swift */; };
+		02EBC75B2C19DE3D00BE182C /* CourseForSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02EBC75A2C19DE3D00BE182C /* CourseForSync.swift */; };
 		02F164372902A9EB0090DDEF /* StringExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F164362902A9EB0090DDEF /* StringExtension.swift */; };
 		02F6EF3B28D9B8EC00835477 /* CourseCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F6EF3A28D9B8EC00835477 /* CourseCellView.swift */; };
 		02F6EF4A28D9F0A700835477 /* DateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F6EF4928D9F0A700835477 /* DateExtension.swift */; };
@@ -205,8 +211,10 @@
 		021D924728DC860C00ACC565 /* Data_UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_UserProfile.swift; sourceTree = "<group>"; };
 		021D924F28DC89D100ACC565 /* UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfile.swift; sourceTree = "<group>"; };
 		021D925628DCF12900ACC565 /* AlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertView.swift; sourceTree = "<group>"; };
+		022020452C11BB2200D15795 /* Data_CourseDates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_CourseDates.swift; sourceTree = "<group>"; };
 		02280F5A294B4E6F0032823A /* Connectivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connectivity.swift; sourceTree = "<group>"; };
 		02284C172A3B1AE00007117F /* UIApplicationExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplicationExtension.swift; sourceTree = "<group>"; };
+		02286D152C106393005EEC8D /* CourseDates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseDates.swift; sourceTree = "<group>"; };
 		022C64E329AE0191000F532B /* TextWithUrls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextWithUrls.swift; sourceTree = "<group>"; };
 		0231CDBD2922422D00032416 /* CSSInjector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSSInjector.swift; sourceTree = "<group>"; };
 		0233D56E2AF13EB200BAC8BD /* StarRatingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarRatingView.swift; sourceTree = "<group>"; };
@@ -264,6 +272,7 @@
 		02A4833729B8A8F800D33F33 /* CoreDataModel.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = CoreDataModel.xcdatamodel; sourceTree = "<group>"; };
 		02A4833929B8A9AB00D33F33 /* DownloadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadManager.swift; sourceTree = "<group>"; };
 		02A4833B29B8C57800D33F33 /* DownloadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadView.swift; sourceTree = "<group>"; };
+		02A8C5802C05DBB4004B91FF /* Data_EnrollmentsStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_EnrollmentsStatus.swift; sourceTree = "<group>"; };
 		02AFCC172AEFDB24000360F0 /* ThirdPartyMailClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThirdPartyMailClient.swift; sourceTree = "<group>"; };
 		02AFCC192AEFDC18000360F0 /* ThirdPartyMailer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThirdPartyMailer.swift; sourceTree = "<group>"; };
 		02B2B593295C5C7A00914876 /* Thread.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thread.swift; sourceTree = "<group>"; };
@@ -277,6 +286,9 @@
 		02E224DA2BB76B3E00EF1ADB /* DynamicOffsetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicOffsetView.swift; sourceTree = "<group>"; };
 		02E225AF291D29EB0067769A /* UrlExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlExtension.swift; sourceTree = "<group>"; };
 		02E93F842AEBAEBC006C4750 /* AppReviewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppReviewViewModel.swift; sourceTree = "<group>"; };
+		02EBC7562C19DCDB00BE182C /* SyncStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncStatus.swift; sourceTree = "<group>"; };
+		02EBC7582C19DE1100BE182C /* CalendarManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarManagerProtocol.swift; sourceTree = "<group>"; };
+		02EBC75A2C19DE3D00BE182C /* CourseForSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseForSync.swift; sourceTree = "<group>"; };
 		02ED50CB29A64B84008341CD /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		02F164362902A9EB0090DDEF /* StringExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtension.swift; sourceTree = "<group>"; };
 		02F6EF3A28D9B8EC00835477 /* CourseCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourseCellView.swift; sourceTree = "<group>"; };
@@ -611,6 +623,8 @@
 				027BD3912907D88F00392132 /* Data_RegistrationFields.swift */,
 				028F9F36293A44C700DE65D0 /* Data_ResetPassword.swift */,
 				07E0939E2B308D2800F1E4B2 /* Data_Certificate.swift */,
+				02A8C5802C05DBB4004B91FF /* Data_EnrollmentsStatus.swift */,
+				022020452C11BB2200D15795 /* Data_CourseDates.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -637,7 +651,10 @@
 				027BD39B2908810C00392132 /* RegisterUser.swift */,
 				028F9F38293A452B00DE65D0 /* ResetPassword.swift */,
 				020C31C8290AC3F700D6DEA2 /* PickerFields.swift */,
+				02EBC75A2C19DE3D00BE182C /* CourseForSync.swift */,
 				076F297E2A1F80C800967E7D /* Pagination.swift */,
+				02286D152C106393005EEC8D /* CourseDates.swift */,
+				02EBC7562C19DCDB00BE182C /* SyncStatus.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -735,6 +752,7 @@
 				025A204F2C071EB0003EA08D /* ErrorAlertView.swift */,
 				0727878028D25EFD002E9142 /* SnackBarView.swift */,
 				02F6EF3A28D9B8EC00835477 /* CourseCellView.swift */,
+				02EBC7582C19DE1100BE182C /* CalendarManagerProtocol.swift */,
 				024FCCFF28EF1CD300232339 /* WebBrowser.swift */,
 				028CE96829858ECC00B6B1C3 /* FlexibleKeyboardInputView.swift */,
 				023A4DD3299E66BD006C0E48 /* OfflineSnackBarView.swift */,
@@ -1089,6 +1107,7 @@
 				0727878528D31657002E9142 /* Data_User.swift in Sources */,
 				064987942B4D69FF0071642A /* WebviewInjection.swift in Sources */,
 				02F6EF4A28D9F0A700835477 /* DateExtension.swift in Sources */,
+				02EBC7572C19DCDB00BE182C /* SyncStatus.swift in Sources */,
 				DBF6F2462B01DAFE0098414B /* AgreementConfig.swift in Sources */,
 				027BD3AF2909475000392132 /* DismissKeyboardTapHandler.swift in Sources */,
 				027F1BF72C071C820001A24C /* NavigationTitle.swift in Sources */,
@@ -1102,6 +1121,7 @@
 				027BD3B92909476200392132 /* KeyboardAvoidingModifier.swift in Sources */,
 				BA4AFB422B5A7A0900A21367 /* VideoDownloadQualityView.swift in Sources */,
 				0770DE2C28D092B3006D8A5D /* NetworkLogger.swift in Sources */,
+				02A8C5812C05DBB4004B91FF /* Data_EnrollmentsStatus.swift in Sources */,
 				06BEEA0E2B6A55C500D25A97 /* ColorInversionInjection.swift in Sources */,
 				064987972B4D69FF0071642A /* WebView.swift in Sources */,
 				0770DE2A28D0929E006D8A5D /* HTTPTask.swift in Sources */,
@@ -1159,8 +1179,10 @@
 				02C917F029CDA99E00DBB8BD /* Data_Enrollments.swift in Sources */,
 				024FCD0028EF1CD300232339 /* WebBrowser.swift in Sources */,
 				027BD3B52909475900392132 /* KeyboardStateObserver.swift in Sources */,
+				022020462C11BB2200D15795 /* Data_CourseDates.swift in Sources */,
 				0283347D28D4D3DE00C828FC /* Data_Discovery.swift in Sources */,
 				064987962B4D69FF0071642A /* WebviewMessage.swift in Sources */,
+				02EBC75B2C19DE3D00BE182C /* CourseForSync.swift in Sources */,
 				07DDFCBD29A780BB00572595 /* UINavigationController+Animation.swift in Sources */,
 				023A4DD4299E66BD006C0E48 /* OfflineSnackBarView.swift in Sources */,
 				021D925728DCF12900ACC565 /* AlertView.swift in Sources */,
@@ -1190,6 +1212,7 @@
 				071009D028D1E3A600344290 /* Constants.swift in Sources */,
 				0770DE1928D0847D006D8A5D /* BaseRouter.swift in Sources */,
 				BA30427F2B20B320009B64B7 /* SocialAuthError.swift in Sources */,
+				02286D162C106393005EEC8D /* CourseDates.swift in Sources */,
 				0284DBFE28D48C5300830893 /* CourseItem.swift in Sources */,
 				0248C92329C075EF00DC8402 /* CourseBlockModel.swift in Sources */,
 				E0D5861A2B2FF74C009B4BA7 /* DiscoveryConfig.swift in Sources */,
@@ -1203,6 +1226,7 @@
 				BAFB99842B0E282E007D09F9 /* MicrosoftConfig.swift in Sources */,
 				02B2B594295C5C7A00914876 /* Thread.swift in Sources */,
 				E0D5861C2B2FF85B009B4BA7 /* RawStringExtactable.swift in Sources */,
+				02EBC7592C19DE1100BE182C /* CalendarManagerProtocol.swift in Sources */,
 				027BD3BD2909478B00392132 /* UIView+EnclosingScrollView.swift in Sources */,
 				BA8FA6682AD59A5700EA029A /* SocialAuthButton.swift in Sources */,
 				02D400612B0678190029D168 /* SKStoreReviewControllerExtension.swift in Sources */,

diff --git a/.../Course/Data/Model/Data_CourseDates.swift → Core/Core/Data/Model/Data_CourseDates.swift b/.../Course/Data/Model/Data_CourseDates.swift → Core/Core/Data/Model/Data_CourseDates.swift
@@ -1,12 +1,11 @@
 //
 //  Data_CourseDates.swift
-//  Course
+//  Core
 //
-//  Created by Muhammad Umer on 10/18/23.
+//  Created by  Stepanok Ivan on 05.06.2024.
 //
 
 import Foundation
-import Core
 
 public extension DataLayer {
     struct CourseDates: Codable {
@@ -100,46 +99,46 @@ public extension DataLayer {
         case upgradeToResetBanner
         case resetDatesBanner
 
-        var header: String {
+        public var header: String {
             switch self {
             case .datesTabInfoBanner:
-                CourseLocalization.CourseDates.ResetDate.TabInfoBanner.header
+                CoreLocalization.CourseDates.ResetDate.TabInfoBanner.header
             case .upgradeToCompleteGradedBanner:
-                CourseLocalization.CourseDates.ResetDate.UpgradeToCompleteGradedBanner.header
+                CoreLocalization.CourseDates.ResetDate.UpgradeToCompleteGradedBanner.header
             case .upgradeToResetBanner:
-                CourseLocalization.CourseDates.ResetDate.UpgradeToResetBanner.header
+                CoreLocalization.CourseDates.ResetDate.UpgradeToResetBanner.header
             case .resetDatesBanner:
-                CourseLocalization.CourseDates.ResetDate.ResetDateBanner.header
+                CoreLocalization.CourseDates.ResetDate.ResetDateBanner.header
             }
         }
 
-        var body: String {
+        public var body: String {
             switch self {
             case .datesTabInfoBanner:
-                CourseLocalization.CourseDates.ResetDate.TabInfoBanner.body
+                CoreLocalization.CourseDates.ResetDate.TabInfoBanner.body
             case .upgradeToCompleteGradedBanner:
-                CourseLocalization.CourseDates.ResetDate.UpgradeToCompleteGradedBanner.body
+                CoreLocalization.CourseDates.ResetDate.UpgradeToCompleteGradedBanner.body
             case .upgradeToResetBanner:
-                CourseLocalization.CourseDates.ResetDate.UpgradeToResetBanner.body
+                CoreLocalization.CourseDates.ResetDate.UpgradeToResetBanner.body
             case .resetDatesBanner:
-                CourseLocalization.CourseDates.ResetDate.ResetDateBanner.body
+                CoreLocalization.CourseDates.ResetDate.ResetDateBanner.body
             }
         }
 
-        var buttonTitle: String {
+        public var buttonTitle: String {
             switch self {
             case .upgradeToCompleteGradedBanner, .upgradeToResetBanner:
                 // Mobile payments are not implemented yet and to avoid breaking appstore guidelines,
                 // upgrade button is hidden, which leads user to payments
                 ""
             case .resetDatesBanner:
-                CourseLocalization.CourseDates.ResetDate.ResetDateBanner.button
+                CoreLocalization.CourseDates.ResetDate.ResetDateBanner.button
             default:
                 ""
             }
         }
 
-        var analyticsBannerType: String {
+        public var analyticsBannerType: String {
             switch self {
             case .datesTabInfoBanner:
                 "info"

diff --git a/Core/Core/Data/Model/Data_EnrollmentsStatus.swift b/Core/Core/Data/Model/Data_EnrollmentsStatus.swift
@@ -0,0 +1,31 @@
+//
+//  Data_EnrollmentsStatus.swift
+//  Core
+//
+//  Created by  Stepanok Ivan on 28.05.2024.
+//
+
+import Foundation
+
+extension DataLayer {
+    // MARK: - EnrollmentsStatusElement
+    public struct EnrollmentsStatusElement: Codable {
+        public let courseID: String?
+        public let courseName: String?
+        public let isActive: Bool?
+
+        public enum CodingKeys: String, CodingKey {
+            case courseID = "course_id"
+            case courseName = "course_name"
+            case isActive = "is_active"
+        }
+
+        public init(courseID: String?, courseName: String?, isActive: Bool?) {
+            self.courseID = courseID
+            self.courseName = courseName
+            self.isActive = isActive
+        }
+    }
+
+    public typealias EnrollmentsStatus = [EnrollmentsStatusElement]
+}