refactored variantSignifiers to variantSignifiersFor

jpavley · Jul 1, 2019 · 77af6b5 · 77af6b5
1 parent e230c91
commit 77af6b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/Comic Keeper/Collection View Controllers/IssuesTableViewController.swift b/Comic Keeper/Collection View Controllers/IssuesTableViewController.swift
@@ -39,9 +39,9 @@ class IssuesTableViewController: UITableViewController {
 
         let issues = comicBookCollection.issuesNumbersFor(publisherName: currentPublisherName, seriesTitle: currentSeriesTitle)
         let currentIssueNumber = issues[section]
-        let variants = comicBookCollection.variantSignifiers(issueNumber: currentIssueNumber,
-                                                             seriesTitle: currentSeriesTitle,
-                                                             publisherName: currentPublisherName)
+        let variants = comicBookCollection.variantSignifiersFor(publisherName: currentPublisherName,
+                                                                seriesTitle: currentSeriesTitle,
+                                                                issueNumber: currentIssueNumber)
         return variants.count
     }
 
@@ -55,9 +55,9 @@ class IssuesTableViewController: UITableViewController {
         // get data for the cell
         let issues = comicBookCollection.issuesNumbersFor(publisherName: currentPublisherName, seriesTitle: currentSeriesTitle)
         let currentIssueNumber = issues[indexPath.section]
-        let variants = comicBookCollection.variantSignifiers(issueNumber: currentIssueNumber,
-                                                             seriesTitle: currentSeriesTitle,
-                                                             publisherName: currentPublisherName)
+        let variants = comicBookCollection.variantSignifiersFor(publisherName: currentPublisherName,
+                                                                seriesTitle: currentSeriesTitle,
+                                                                issueNumber: currentIssueNumber)
         let currentVariant = variants[indexPath.row]
         let currentIssue = issues[indexPath.section]
 
@@ -122,9 +122,9 @@ class IssuesTableViewController: UITableViewController {
 
                 let currentIssueNumber = issues[selectedIndexPath.section]
 
-                let variants = comicBookCollection.variantSignifiers(issueNumber: currentIssueNumber,
-                                                                     seriesTitle: currentSeriesTitle,
-                                                                     publisherName: currentPublisherName)
+                let variants = comicBookCollection.variantSignifiersFor(publisherName: currentPublisherName,
+                                                                        seriesTitle: currentSeriesTitle,
+                                                                        issueNumber: currentIssueNumber)
 
                 let variant = variants[selectedIndexPath.row]
 

diff --git a/Comic Keeper/Models/ComicBookCollection.swift b/Comic Keeper/Models/ComicBookCollection.swift
@@ -153,10 +153,7 @@ public class ComicBookCollection {
         return filteredNumbers
     }
 
-    // TODO: Change variantSignifiers(issueNumber:seriesTitle:publisherName:) to issuesNumbersFor(publisherName:seriesTitle:issueNumber)
-    // TODO: Should it be variantSignifiers(publisher:series:era:issueNUmber) ?
-
-    public func variantSignifiers(issueNumber: String, seriesTitle: String, publisherName: String) -> [String] {
+    public func variantSignifiersFor(publisherName: String, seriesTitle: String, issueNumber: String) -> [String] {
         let variants = comicBooks.compactMap {
             $0.comic.publisher == publisherName && $0.seriesTitle == seriesTitle && $0.comic.issueNumber == issueNumber ? $0.comic.variant : nil
         }

diff --git a/ComicBookTests/ComicBookTests.swift b/ComicBookTests/ComicBookTests.swift
@@ -127,8 +127,8 @@ class ComicBookTests: XCTestCase {
     }
 
     func  testVariantSignifiers() {
-        print(cbcUT.variantSignifiers(issueNumber: dummyDataIssueNumbers.first!, seriesTitle: dummyDataSeriesTitles.first!, publisherName: dummyDataFirstPublisherName))
-        XCTAssertEqual(cbcUT.variantSignifiers(issueNumber: dummyDataIssueNumbers.first!, seriesTitle: dummyDataSeriesTitles.first!, publisherName: dummyDataFirstPublisherName), dummyDataVariantSignifiers)
+        print(cbcUT.variantSignifiersFor(publisherName: dummyDataFirstPublisherName, seriesTitle: dummyDataSeriesTitles.first!, issueNumber: dummyDataIssueNumbers.first!))
+        XCTAssertEqual(cbcUT.variantSignifiersFor(publisherName: dummyDataFirstPublisherName, seriesTitle: dummyDataSeriesTitles.first!, issueNumber: dummyDataIssueNumbers.first!), dummyDataVariantSignifiers)
     }
 
     func testGetComicBookByParameters() {