Implement comparing terms function in Swift

Author: crazytonyli

Modules/Sources/WordPressKit/RemotePost.swift

@@ -0,0 +1,10 @@
+import Foundation
+import WordPressKitObjC
+
+extension RemotePost {
+    public static func compare(otherTerms lhs: [String: [String]], withAnother rhs: [String: [String]]) -> Bool {
+        guard lhs.count == rhs.count else { return false }
+
+        return lhs.mapValues { Set($0) } == rhs.mapValues { Set($0) }
+    }
+}

Modules/Sources/WordPressKit/RemotePostParameters.swift

@@ -140,7 +140,7 @@ extension RemotePostCreateParameters {
         if previous.tags != tags {
             changes.tags = tags
         }
-        if !RemotePost.compareOtherTerms(previous.otherTerms, withAnother: otherTerms) {
+        if !RemotePost.compare(otherTerms: previous.otherTerms, withAnother: otherTerms) {
             changes.otherTerms = otherTerms
         }
         if Set(previous.categoryIDs) != Set(categoryIDs) {

Modules/Sources/WordPressKitObjC/RemotePost.m

@@ -23,25 +23,6 @@ - (id)initWithSiteID:(NSNumber *)siteID status:(NSString *)status title:(NSStrin
     return self;
 }
 
-+ (BOOL)compareOtherTerms:(NSDictionary<NSString *, NSArray<NSString *> *> *)lhs withAnother:(NSDictionary<NSString *, NSArray<NSString *> *> *)rhs
-{
-    if (lhs.count != rhs.count) {
-        return NO;
-    }
-
-    NSMutableDictionary<NSString *, NSSet<NSString *> *> *lhsNormalized = [NSMutableDictionary dictionary];
-    for (NSString *key in lhs) {
-        lhsNormalized[key] = [NSSet setWithArray:lhs[key]];
-    }
-
-    NSMutableDictionary<NSString *, NSSet<NSString *> *> *rhsNormalized = [NSMutableDictionary dictionary];
-    for (NSString *key in rhs) {
-        rhsNormalized[key] = [NSSet setWithArray:rhs[key]];
-    }
-
-    return [lhsNormalized isEqualToDictionary:rhsNormalized];
-}
-
 - (NSString *)debugDescription {
     NSDictionary *properties = [self debugProperties];
     return [NSString stringWithFormat:@"<%@: %p> (%@)", NSStringFromClass([self class]), self, properties];

Modules/Sources/WordPressKitObjC/include/RemotePost.h

@@ -56,7 +56,6 @@ extern NSString * const PostStatusDeleted;
 @property (nonatomic, strong) NSArray *categories;
 @property (nonatomic, strong) NSArray *revisions;
 @property (nonatomic, strong) NSArray *tags;
-//@property (nonatomic, strong) NSArray<RemotePostTerm *> *otherTerms;
 @property (nonatomic, strong) NSDictionary<NSString *, NSArray<NSString *> *> *otherTerms;
 @property (nonatomic, strong) NSString *pathForDisplayImage;
 @property (nonatomic, assign) NSNumber *isStickyPost;
@@ -67,8 +66,6 @@ extern NSString * const PostStatusDeleted;
  */
 @property (nonatomic, strong) NSArray *metadata;
 
-+ (BOOL)compareOtherTerms:(NSDictionary<NSString *, NSArray<NSString *> *> *)lhs withAnother:(NSDictionary<NSString *, NSArray<NSString *> *> *)rhs;
-
 // Featured images?
 // Geolocation?
 // Attachments?

Sources/WordPressData/Objective-C/AbstractPost.m

@@ -365,9 +365,4 @@ - (void)setParsedOtherTerms:(NSDictionary<NSString *, NSArray<NSString *> *> *)d
     return [NSJSONSerialization JSONObjectWithData:self.rawOtherTerms options:0 error:nil] ?: [NSDictionary dictionary];
 }
 
-+ (BOOL)compareOtherTerms:(NSDictionary<NSString *, NSArray<NSString *> *> *)lhs withAnother:(NSDictionary<NSString *, NSArray<NSString *> *> *)rhs
-{
-    return [RemotePost compareOtherTerms:lhs withAnother:rhs];
-}
-
 @end

Sources/WordPressData/Objective-C/include/AbstractPost.h

@@ -133,8 +133,6 @@ typedef NS_ENUM(NSUInteger, AbstractPostRemoteStatus) {
 - (void)setParsedOtherTerms:(NSDictionary<NSString *, NSArray<NSString *> *> *)data;
 - (NSDictionary<NSString *, NSArray<NSString *> *> *)parseOtherTerms;
 
-+ (BOOL)compareOtherTerms:(NSDictionary<NSString *, NSArray<NSString *> *> *)lhs withAnother:(NSDictionary<NSString *, NSArray<NSString *> *> *)rhs;
-
 @end
 
 @interface AbstractPost (CoreDataGeneratedAccessors)

Tests/WordPressKitTests/WordPressKitTests/Tests/Models/PostTermComparisonTests.swift

@@ -9,7 +9,7 @@ struct PostTermComparisonTests {
         let lhs: [String: [String]] = [:]
         let rhs: [String: [String]] = [:]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == true)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == true)
     }
 
     @Test
@@ -23,7 +23,7 @@ struct PostTermComparisonTests {
             "post_tag": ["tag1", "tag2"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == true)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == true)
     }
 
     @Test
@@ -37,7 +37,7 @@ struct PostTermComparisonTests {
             "post_tag": ["tag2", "tag1"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == true)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == true)
     }
 
     @Test
@@ -49,7 +49,7 @@ struct PostTermComparisonTests {
             "post_tag": ["tag1", "tag2"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == false)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == false)
     }
 
     @Test
@@ -61,7 +61,7 @@ struct PostTermComparisonTests {
             "category": ["1", "2", "4"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == false)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == false)
     }
 
     @Test
@@ -74,7 +74,7 @@ struct PostTermComparisonTests {
             "category": ["1", "2", "3"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == false)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == false)
     }
 
     @Test
@@ -86,7 +86,7 @@ struct PostTermComparisonTests {
             "category": ["1", "2", "3"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == true)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == true)
     }
 
     @Test
@@ -102,7 +102,7 @@ struct PostTermComparisonTests {
             "custom_tax": ["term1"]
         ]
 
-        #expect(RemotePost.compareOtherTerms(lhs, withAnother: rhs) == true)
+        #expect(RemotePost.compare(otherTerms: lhs, withAnother: rhs) == true)
     }
 
 }

WordPress/Classes/ViewRelated/Post/PostSettings/PostSettings.swift

@@ -112,7 +112,7 @@ struct PostSettings: Hashable {
             post.featuredImage = nil
         }
 
-        if !AbstractPost.compareOtherTerms(post.parseOtherTerms(), withAnother: otherTerms) {
+        if !RemotePost.compare(otherTerms:post.parseOtherTerms(), withAnother: otherTerms) {
             post.setParsedOtherTerms(otherTerms)
         }