Merge pull request #435 from woocommerce/issue/19-filtering-active-site-notifications

Filtering Active Site's Notifications

Author: jleandroperez

Storage/Storage/Model/MIGRATIONS.md

@@ -3,6 +3,9 @@
 This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
 
 ## Model 6
+- @jleandroperez 2018-11-15
+    - New `Note.siteID` property
+    
 - @jleandroperez 2018-11-12
     - New `Note.subtype` property (optional type)
 

Storage/Storage/Model/Note+CoreDataProperties.swift

@@ -10,6 +10,7 @@ extension Note {
 
     @NSManaged public var noteID: Int64
     @NSManaged public var noteHash: Int64
+    @NSManaged public var siteID: Int64
     @NSManaged public var read: Bool
     @NSManaged public var icon: String?
     @NSManaged public var noticon: String?

Storage/Storage/Model/WooCommerce.xcdatamodeld/Model 6.xcdatamodel/contents

@@ -16,6 +16,7 @@
         <attribute name="noteID" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="noticon" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="read" attributeType="Boolean" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="siteID" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="subject" optional="YES" attributeType="Binary" syncable="YES"/>
         <attribute name="subtype" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="timestamp" attributeType="String" syncable="YES"/>
@@ -176,7 +177,7 @@
     </entity>
     <elements>
         <element name="Account" positionX="-200.9765625" positionY="63.5625" width="128" height="120"/>
-        <element name="Note" positionX="-162" positionY="180" width="128" height="255"/>
+        <element name="Note" positionX="-162" positionY="180" width="128" height="270"/>
         <element name="Order" positionX="-20" positionY="27" width="128" height="690"/>
         <element name="OrderCoupon" positionX="-206.01953125" positionY="379.74609375" width="128" height="120"/>
         <element name="OrderItem" positionX="-364.890625" positionY="379.453125" width="128" height="225"/>

WooCommerce/Classes/ViewRelated/Notifications/NotificationsViewController.swift

@@ -30,7 +30,10 @@ class NotificationsViewController: UIViewController {
     /// Store Notifications CoreData Filter.
     ///
     private var filter: NSPredicate {
-        return NSPredicate(format: "type == %@ OR subtype == %@", Note.Kind.storeOrder.rawValue, Note.Subkind.storeReview.rawValue)
+        let typePredicate = NSPredicate(format: "type == %@ OR subtype == %@", Note.Kind.storeOrder.rawValue, Note.Subkind.storeReview.rawValue)
+        let sitePredicate = NSPredicate(format: "siteID == %lld", StoresManager.shared.sessionManager.defaultStoreID ?? Int.min)
+
+        return NSCompoundPredicate(andPredicateWithSubpredicates: [typePredicate, sitePredicate])
     }
 
     /// Pull To Refresh Support.

Yosemite/Yosemite/Model/Storage/Note+ReadOnlyConvertible.swift

@@ -8,6 +8,9 @@ extension Storage.Note: ReadOnlyConvertible {
     /// Updates the Storage.Note with the a ReadOnly.
     ///
     public func update(with note: Yosemite.Note) {
+        let theSiteID = note.meta.identifier(forKey: .site) ?? Int.min
+
+        siteID = Int64(theSiteID)
         noteID = Int64(note.noteId)
         noteHash = Int64(note.hash)
         read = note.read