Clean up code

Author: itsmeichigo

WooCommerce/Classes/Bookings/BookingFilters/BookingFiltersViewModel.swift

@@ -35,12 +35,12 @@ final class BookingFiltersViewModel: FilterListViewModel {
     }
 
     var criteria: Filters {
-        let teamMember = teamMemberFilterViewModel.selectedValue as? BookingResource ?? nil
-        let product = productFilterViewModel.selectedValue as? BookingProductFilter ?? nil
-        let customer = customerFilterViewModel.selectedValue as? CustomerFilter ?? nil
-        let attendanceStatus = attendanceStatusFilterViewModel.selectedValue as? BookingAttendanceStatus ?? nil
-        let paymentStatus = paymentStatusFilterViewModel.selectedValue as? BookingStatus ?? nil
-        let dateRange = dateTimeFilterViewModel.selectedValue as? BookingDateRangeFilter ?? nil
+        let teamMember = teamMemberFilterViewModel.selectedValue as? BookingResource
+        let product = productFilterViewModel.selectedValue as? BookingProductFilter
+        let customer = customerFilterViewModel.selectedValue as? CustomerFilter
+        let attendanceStatus = attendanceStatusFilterViewModel.selectedValue as? BookingAttendanceStatus
+        let paymentStatus = paymentStatusFilterViewModel.selectedValue as? BookingStatus
+        let dateRange = dateTimeFilterViewModel.selectedValue as? BookingDateRangeFilter
         let numberOfActiveFilters = filterTypeViewModels.numberOfActiveFilters
 
         return Filters(teamMember: teamMember,
@@ -74,23 +74,12 @@ final class BookingFiltersViewModel: FilterListViewModel {
     }
 
     func clearAll() {
-        let clearedTeamMember: BookingResource? = nil
-        teamMemberFilterViewModel.selectedValue = clearedTeamMember
-
-        let clearedProduct: BookingProductFilter? = nil
-        productFilterViewModel.selectedValue = clearedProduct
-
-        let clearedCustomer: CustomerFilter? = nil
-        customerFilterViewModel.selectedValue = clearedCustomer
-
-        let clearedAttendanceStatus: BookingAttendanceStatus? = nil
-        attendanceStatusFilterViewModel.selectedValue = clearedAttendanceStatus
-
-        let clearedPaymentStatus: BookingStatus? = nil
-        paymentStatusFilterViewModel.selectedValue = clearedPaymentStatus
-
-        let clearedDateRange: BookingDateRangeFilter? = nil
-        dateTimeFilterViewModel.selectedValue = clearedDateRange
+        teamMemberFilterViewModel.selectedValue = BookingResource?.none
+        productFilterViewModel.selectedValue = BookingProductFilter?.none
+        customerFilterViewModel.selectedValue = CustomerFilter?.none
+        attendanceStatusFilterViewModel.selectedValue = BookingAttendanceStatus?.none
+        paymentStatusFilterViewModel.selectedValue = BookingStatus?.none
+        dateTimeFilterViewModel.selectedValue = BookingDateRangeFilter?.none
     }
 
     typealias Criteria = Filters