Allow TaxonomyRequests to succeed when creating URLs to their JSON re…

…sources

Sources/Models/PersistenceManager.swift

@@ -64,9 +64,10 @@ protocol PersistenceManagerProtocol {
     func save(tagLine: Tagline)
     func tagLine() -> Tagline?
     var additivesIsEmpty: Bool { get }
-    
+
     func save(labels: [Label])
     func label(forCode: String) -> Label?
+    var labelsIsEmpty: Bool { get }
 
     // Offline
     func save(offlineProducts: [RealmOfflineProduct])
@@ -372,15 +373,15 @@ class PersistenceManager: PersistenceManagerProtocol {
         saveOrUpdate(objects: labels)
         log.info("Saved \(labels.count) labels in taxonomy database")
     }
-    
+
     func label(forCode code: String) -> Label? {
         return getRealm().object(ofType: Label.self, forPrimaryKey: code)
     }
-    
+
     var labelsIsEmpty: Bool {
         getRealm().objects(Label.self).isEmpty
     }
-    
+
     // Offline Products
     func save(offlineProducts: [RealmOfflineProduct]) {
         saveOrUpdate(objects: offlineProducts)

Sources/Network/TaxonomiesParser.swift

@@ -105,7 +105,7 @@ struct TaxonomiesParser: TaxonomiesParserProtocol {
         })
         return ingredientsAnalysisConfig
     }
-    
+
     func parseLabels(data: [String: Any]) -> [Label] {
         let labels = data.compactMap({ (labelCode: String, value: Any) -> Label? in
             let tags = parseTags(value: value)

Sources/Network/TaxonomiesRequest.swift

@@ -30,6 +30,8 @@ struct TaxonomiesRequest: URLRequestConvertible {
             return route.rawValue + "/data/" + Endpoint.get
         case (.post, _):
             return Endpoint.post + route.rawValue
+        case (.get, _):
+            return Endpoint.get + "/data/" + route.rawValue
         default:
             return ""
         }

Sources/Network/TaxonomiesService.swift

@@ -20,7 +20,7 @@ enum TaxonomiesRoute: String {
     case getVitamins = "taxonomies/vitamins.json"
     case getMinerals = "taxonomies/minerals.json"
     case getNucleotides = "taxonomies/nucleotides.json"
-    case getInvalidBarcodes = "invalid-barcodes.json"
+    case getInvalidBarcodes = "taxonomies/invalid-barcodes.json"
     case getLabels = "taxonomies/labels.json"
 }
 
@@ -357,7 +357,7 @@ class TaxonomiesService: TaxonomiesApi {
              callback(false)
         }
     }
-    
+
     fileprivate func refreshLabels(_ callback: @escaping (_: Bool) -> Void) {
         do {
             let request = try TaxonomiesRequest(route: .getLabels, requestType: .get).asURLRequest()
@@ -402,7 +402,8 @@ class TaxonomiesService: TaxonomiesApi {
             persistenceManager.nucleotidesIsEmpty ||
             // persistenceManager.otherNutritionalSubstancesIsEmpty ||
             persistenceManager.ingredientsAnalysisIsEmpty ||
-            persistenceManager.ingredientsAnalysisConfigIsEmpty
+            persistenceManager.ingredientsAnalysisConfigIsEmpty ||
+            persistenceManager.labelsIsEmpty
         if shouldDownload {
             downloadTaxonomies()
         } else {
@@ -480,7 +481,7 @@ class TaxonomiesService: TaxonomiesApi {
                 allSuccess = allSuccess && success
                 group.leave()
             }
-            
+
             group.enter()
             self.refreshLabels({ (success) in
                 allSuccess = allSuccess && success