feat: added taxonomy initial support

Vikram Kalta · Vikram Kalta · commit 84b98006d8f3 · 2024-08-06T22:21:49.000+01:00
diff --git a/Contentstack.xcodeproj/project.pbxproj b/Contentstack.xcodeproj/project.pbxproj
@@ -96,6 +96,7 @@
 		23A53F5A1E277CD3001DBE35 /* Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 230B38C01C16E98B00444A14 /* Contentstack.framework */; };
 		23B6F12A1B5662EE00A9E983 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B6F1281B5662EE00A9E983 /* ISO8601DateFormatter.m */; };
 		4714B7D42C5EAFCC004E941E /* Taxonomy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4714B7D32C5EAFCC004E941E /* Taxonomy.m */; };
+		479EC6642C5FCBDC00C5630B /* Taxonomy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4714B7D52C5EAFF5004E941E /* Taxonomy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		565E11BB1BD76654005AD47F /* MMDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AA1BD76654005AD47F /* MMDocument.m */; };
 		565E11BC1BD76654005AD47F /* MMElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AD1BD76654005AD47F /* MMElement.m */; };
 		565E11BD1BD76654005AD47F /* MMGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 565E11AF1BD76654005AD47F /* MMGenerator.m */; };
@@ -497,6 +498,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				479EC6642C5FCBDC00C5630B /* Taxonomy.h in Headers */,
 				0F9C0FC8221ADAC90091205A /* NamespacedDependencies.h in Headers */,
 				23A53F3C1E276C83001DBE35 /* CSIOAPIURLs.h in Headers */,
 				23A53F3E1E276C83001DBE35 /* CSIOCoreHTTPNetworking.h in Headers */,
@@ -845,7 +847,7 @@
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/ThirdPartyExtension",
+					"$(PROJECT_DIR)/ThirdPartyExtension/**",
 				);
 				GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
 				INFOPLIST_FILE = Contentstack/Info.plist;
@@ -874,7 +876,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/ThirdPartyExtension",
+					"$(PROJECT_DIR)/ThirdPartyExtension/**",
 				);
 				GCC_PREFIX_HEADER = ./Contentstack/ThirdPartyNamespaceHeader/NamespacedDependencies.h;
 				INFOPLIST_FILE = Contentstack/Info.plist;
@@ -923,7 +925,7 @@
 		23A0F86A1B3801D1003334E9 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				BITCODE_GENERATION_MODE = marker;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -978,7 +980,7 @@
 		23A0F86B1B3801D1003334E9 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
+				ALWAYS_SEARCH_USER_PATHS = YES;
 				BITCODE_GENERATION_MODE = bitcode;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
diff --git a/Contentstack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Contentstack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Contentstack/Contentstack.h b/Contentstack/Contentstack.h
@@ -12,6 +12,7 @@
 #import <Contentstack/Config.h>
 #import <Contentstack/Stack.h>
 #import <Contentstack/ContentType.h>
+#import <Contentstack/Taxonomy.h>
 #import <Contentstack/Entry.h>
 #import <Contentstack/Query.h>
 #import <Contentstack/Asset.h>
diff --git a/Contentstack/Entry.m b/Contentstack/Entry.m
@@ -49,6 +49,16 @@ - (instancetype)initWithContentType:(ContentType*)contentType withEntryUID:(NSSt
     return self;
 }
 
+- (instancetype)initWithTaxonomy:(Taxonomy *)taxonomy {
+    if (self = [super init]) {
+        _taxonomy = taxonomy;
+        _localHeaders = [NSMutableDictionary dictionary];
+        _objectProperties = [NSMutableDictionary dictionary];
+        _postParamDictionary = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
 -(void)setLanguage:(Language)language {
     _language = language;
     [self setLocale:[self localeCode:language]];
@@ -63,6 +73,9 @@ - (instancetype)initWithContentType:(ContentType*)contentType {
     return [self initWithContentType:contentType withEntryUID:nil];
 }
 
+//- (instancetype)initWithTaxonomy:(Taxonomy*)taxonomy {
+//    return [self initWithTaxonomy:taxonomy];
+//}
 //MARK: - Headers -
 
 - (void)setHeader:(NSString *)headerValue forKey:(NSString *)headerKey {
diff --git a/Contentstack/Query.h b/Contentstack/Query.h
@@ -130,6 +130,8 @@ This method provides all the entries for the specified language in the response.
  */
 - (void)search:(NSString *)searchString;
 
+- (void)query:(NSDictionary *)queryString;
+
 //MARK: - Tags -
 /**---------------------------------------------------------------------------------------
  * @name Tags
@@ -759,6 +761,9 @@ This method provides all the entries from a specified contenttype.
  */
 - (void)find:(void (^) (ResponseType type,QueryResult * BUILT_NULLABLE_P result,NSError * BUILT_NULLABLE_P error))completionBlock;
 
+
+- (void)findTaxonomy:(void (^) (ResponseType type,QueryResult * BUILT_NULLABLE_P result,NSError * BUILT_NULLABLE_P error))completionBlock;
+
 /**
 This method provides the first entry from a specified contenttype.
  
diff --git a/Contentstack/Query.m b/Contentstack/Query.m
@@ -42,6 +42,7 @@ - (instancetype)initWithContentType:(ContentType*)contentType {
 
 - (instancetype)initWithTaxonomy:(Taxonomy*)taxonomy {
     if (self = [super init]) {
+        _taxonomy = taxonomy;
         _localHeaders = [NSMutableDictionary dictionary];
         _queryDictionary = [NSMutableDictionary dictionary];
         _requestOperationSet = [NSMutableSet set];
@@ -94,6 +95,11 @@ - (void)tags:(NSArray*)tagsArray {
     [self.queryDictionary setObject:[tagsArray componentsJoinedByString:@","] forKey:kCSIO_Tags];
 }
 
+//MARK: - Query -
+- (void)query:(NSDictionary *)query {
+    [self.queryDictionary setObject:query forKey:kCSIO_Queryable];
+}
+
 ////MARK: - Before/After UID -
 //- (void)beforeUID:(NSString *)uid {
 //    [self.queryDictionary setObject:uid forKey:kCSIO_BeforeUID];
@@ -511,6 +517,35 @@ - (void)find:(void (^) (ResponseType type,QueryResult * BUILT_NULLABLE_P result,
     }
 }
 
+//MARK: Execute Query -
+
+- (void)findTaxonomy:(void (^) (ResponseType type,QueryResult * BUILT_NULLABLE_P result,NSError * BUILT_NULLABLE_P error))completionBlock {
+    
+    [self.queryDictionary setObject:self.taxonomy.stack.environment forKey:kCSIO_Environment];
+    
+    NSMutableDictionary *paramDictionary = [NSMutableDictionary dictionaryWithDictionary:self.queryDictionary];
+    
+    NSMutableDictionary *headers = [NSMutableDictionary dictionaryWithDictionary:self.taxonomy.headers];
+
+    [headers addEntriesFromDictionary:self.localHeaders];
+
+    NSString *path = [CSIOAPIURLs fetchTaxonomyWithVersion:self.taxonomy.stack.version];
+    
+    NSURLSessionDataTask *op = [self.taxonomy.stack.network requestForStack:self.taxonomy.stack withURLPath:path requestType:CSIOCoreNetworkingRequestTypeGET params:paramDictionary additionalHeaders:headers cachePolicy:self.cachePolicy completion:^(ResponseType responseType, id responseJSON, NSError *error) {
+
+        if (error) {
+            completionBlock(responseType, nil, error);
+        }else {
+            QueryResult *queryResult = [[QueryResult alloc] initWithTaxonomy:self.taxonomy objectDictionary:responseJSON];
+
+            completionBlock(responseType, queryResult, nil);
+        }
+    }];
+    if (op && ![op isKindOfClass:[NSNull class]]) {
+        [self.requestOperationSet addObject:op];
+    }
+}
+
 - (void)findOne:(void (^) (ResponseType type,Entry * BUILT_NULLABLE_P entry,NSError * BUILT_NULLABLE_P error))completionBlock {
     [self.queryDictionary setObject:@(1) forKey:kCSIO_Limit];
     
diff --git a/Contentstack/QueryResult.h b/Contentstack/QueryResult.h
@@ -12,12 +12,16 @@
 BUILT_ASSUME_NONNULL_BEGIN
 
 @class ContentType;
+@class Taxonomy;
 @class Entry;
 @interface QueryResult : NSObject
 
 
 - (instancetype)init UNAVAILABLE_ATTRIBUTE;
 
+//- (BUILT_NULLABLE NSArray<Entry *> *)getResult;
+- (instancetype)initWithTaxonomy:(Taxonomy*)taxonomy objectDictionary:(NSDictionary*)dictionary;
+
 //MARK: Result -
 /**---------------------------------------------------------------------------------------
  * @name Result
diff --git a/Contentstack/QueryResult.m b/Contentstack/QueryResult.m
@@ -10,6 +10,7 @@
 #import "CSIOInternalHeaders.h"
 #import "CSIOConstants.h"
 #import "ContentType.h"
+#import "Taxonomy.h"
 #import "Entry.h"
 
 @interface QueryResult ()
@@ -30,6 +31,17 @@ - (instancetype)initWithContentType:(ContentType*)contentType objectDictionary:(
     return self;
 }
 
+- (instancetype)initWithTaxonomy:(Taxonomy*)taxonomy objectDictionary:(NSDictionary*)dictionary{
+    if (self = [super init]) {
+        self.taxonomy = taxonomy;
+        self.resultsDictionary = [NSMutableDictionary dictionary];
+        if (dictionary) {
+            [self.resultsDictionary addEntriesFromDictionary:dictionary];
+        }
+    }
+    return self;
+}
+
 - (NSInteger)totalCount {
     
     if ([self.resultsDictionary objectForKey:kCSIO_Count]) {
@@ -55,7 +67,13 @@ - (NSInteger)totalCount {
         NSArray *objectsArray = (NSArray*)[self.resultsDictionary objectForKey:kCSIO_Entries];
         NSMutableArray *entryObjects = [NSMutableArray array];
         // if condition is fix for value of "entries" key ie.array inside array in response JSON
-        if (objectsArray.firstObject && [objectsArray.firstObject isKindOfClass:[NSArray class]]) {
+        if (objectsArray.firstObject && [objectsArray.firstObject isKindOfClass:[NSDictionary class]]) {
+            [objectsArray enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                Entry *formEntry = [self.taxonomy entry];
+                [formEntry configureWithDictionary:obj];
+                [entryObjects addObject:formEntry];
+            }];
+        } else if (objectsArray.firstObject && [objectsArray.firstObject isKindOfClass:[NSArray class]]) {
             [objectsArray enumerateObjectsUsingBlock:^(NSArray *obj, NSUInteger idx, BOOL * _Nonnull stop) {
                 [obj enumerateObjectsUsingBlock:^(NSDictionary *objDict, NSUInteger idx, BOOL * _Nonnull stop) {
                     Entry *formEntry = [self.contentType entry];
diff --git a/Contentstack/Stack.h b/Contentstack/Stack.h
@@ -11,6 +11,7 @@
 
 @class Config;
 @class ContentType;
+@class Taxonomy;
 @class AssetLibrary;
 @class Asset;
 @class SyncStack;
@@ -65,6 +66,8 @@ BUILT_ASSUME_NONNULL_BEGIN
  */
 - (ContentType *)contentTypeWithName:(NSString *)contentTypeName;
 
+- (Taxonomy *)taxonomy;
+
 //MARK: - Manually set headers
 /**---------------------------------------------------------------------------------------
  * @name Manually set headers
diff --git a/Contentstack/Stack.m b/Contentstack/Stack.m
@@ -11,6 +11,7 @@
 #import "CSIOConstants.h"
 #import "CSIOCoreHTTPNetworking.h"
 #import "ContentType.h"
+#import "Taxonomy.h"
 #import "CSIOAPIURLs.h"
 #import "NSObject+Extensions.h"
 
@@ -86,6 +87,12 @@ -(ContentType*)contentTypeWithName:(NSString*)contentTypeName; {
     return contentType;
 }
 
+//MARK: - Taxonomy
+-(Taxonomy*)taxonomy {
+    Taxonomy *taxonomy = [[Taxonomy alloc] initWithStack:self];
+    return taxonomy;
+}
+
 //MARK: - Asset
 
 -(Asset *)asset {
diff --git a/Contentstack/Taxonomy.h b/Contentstack/Taxonomy.h
@@ -77,7 +77,7 @@ Represents a Query on 'ContentType' which can be executed to retrieve entries th
  */
 - (Query*)query;
 
-//MARK: - Content-Type Schema
+//MARK: - Schema
 /**---------------------------------------------------------------------------------------
  * @name ContentType Schema
  *  ---------------------------------------------------------------------------------------
@@ -87,15 +87,15 @@ Represents a Query on 'ContentType' which can be executed to retrieve entries th
  
      //Obj-C
  
-     ContentType * contentType = [stack contentTypeWithName:@"<content_type_id>"]
-     [contentType fetch:params completion:^(NSDictionary * _Nullable contentType, NSError * _Nullable error) {
+     Taxonomy * taxonomy = [stack]
+     [contentType fetch:params completion:^(NSDictionary * _Nullable entries, NSError * _Nullable error) {
  
      }];
  
      //Swift
  
-     let contentType = stack.contentTypeWithName("<content_type_id>")
-     contentType.fetch(params, { (contentType, error) in
+     let taxonomy = stack.taxonomy("")
+     taxonomy.fetch(params, { (entries, error) in
  
      })
  @param completionBlock block to be called once operation is done.
diff --git a/Contentstack/Taxonomy.m b/Contentstack/Taxonomy.m
@@ -30,6 +30,11 @@ -(instancetype)initWithStack:(Stack*)stack {
     return self;
 }
 
+-(Entry*)entry {
+    Entry *entry = [[Entry alloc] initWithTaxonomy:self];
+    return entry;
+}
+
 -(Query*)query {
     Query *query = [[Query alloc] initWithTaxonomy:self];
     return query;
diff --git a/ContentstackInternal/CSIOAPIURLs.m b/ContentstackInternal/CSIOAPIURLs.m
@@ -29,9 +29,8 @@ @implementation CSIOAPIURLs
 static NSString *fetchContentTypeSchema = @"/%@/content_types/%@";
 // sync
 static NSString *syncData = @"/%@/stacks/sync";
-
 // Taxonomy
-static NSString *fetchTaxonomyWithVersion = @"/%@/taxonomies/%@/entries";
+static NSString *fetchTaxonomyWithVersion = @"/%@/taxonomies/entries";
 
 //MARK: Methods -
 
@@ -45,6 +44,11 @@ +(NSString *)fetchContenTypeSchema:(NSString*)contentTypeUID withVersion:(NSStri
     return [NSString stringWithFormat:fetchContentTypeSchema, version, contentTypeUID];
 }
 
+//Taxonomy
++(NSString *)fetchTaxonomyWithVersion:(NSString*)version {
+    return [NSString stringWithFormat:fetchTaxonomyWithVersion, version];
+}
+
 //Query
 +(NSString *)fetchContentTypeEntriesQueryURLWithUID:(NSString *)contentTypeUID withVersion:(NSString*)version{
     return [NSString stringWithFormat:fetchContentTypeEntriesQuery,version,contentTypeUID];
diff --git a/ContentstackInternal/CSIOInternalHeaders.h b/ContentstackInternal/CSIOInternalHeaders.h
@@ -46,6 +46,7 @@
 @interface Query ()
 @property (nonatomic, assign) BOOL shouldFetchFromNetwork;
 @property (nonatomic, strong) ContentType *contentType;
+@property (nonatomic, strong) Taxonomy *taxonomy;
 - (instancetype)initWithContentType:(ContentType *)contentType;
 @property (nonatomic, strong) NSMutableDictionary *queryDictionary;
 - (instancetype)initWithTaxonomy:(Taxonomy *)taxonomy;
@@ -54,6 +55,7 @@
 @interface QueryResult ()
 - (instancetype)initWithContentType:(ContentType *)contentType objectDictionary:(NSDictionary*)dictionary;
 @property (nonatomic, strong) ContentType *contentType;
+@property (nonatomic, strong) Taxonomy *taxonomy;
 @end
 
 @interface ContentType ()
@@ -69,9 +71,11 @@
 @interface Entry ()
 @property (nonatomic, assign, getter=isDeleted) BOOL deleted;
 @property (nonatomic, strong) ContentType *contentType;
+@property (nonatomic, strong) Taxonomy *taxonomy;
 @property (nonatomic, strong) NSMutableDictionary *postParamDictionary;
 - (instancetype)initWithContentType:(ContentType *)contentType;
 - (instancetype)initWithContentType:(ContentType *)contentType withEntryUID:(NSString*)uid;
+- (instancetype)initWithTaxonomy:(Taxonomy *)taxonomy;
 
 @end
 
@@ -81,6 +85,7 @@
 
 -(instancetype)initWithStack:(Stack *)stack;
 -(Stack *)stack;
+-(Entry *)entry;
 @end
 
 @interface Asset ()
diff --git a/ContentstackTest/ContentstackTest.m b/ContentstackTest/ContentstackTest.m
