From 22e8b7058d774135e047ec42d3da0272a7175f97 Mon Sep 17 00:00:00 2001
From: Sergio Azua <sergio.azua@bazaarvoice.com>
Date: Wed, 21 Jun 2017 15:10:53 -0500
Subject: [PATCH] MOB-644 add video to reviews, isSyndicated Q&A

---
 BVSDK.podspec                                 |   2 +-
 BVSDK.xcodeproj/project.pbxproj               |  18 ++-
 BVSDK/Info.plist                              |   4 +-
 Examples/BVSDKDemo/Podfile.lock               |  12 +-
 .../Base.lproj/Main.storyboard                |  12 +-
 .../RootViewController.swift                  |   5 +-
 Examples/Conversations/Swift/Podfile.lock     |   6 +-
 Pod/BVCommon/BVSDKConstants.h                 |   4 +-
 .../GenericConversationsResult/BVAnswer.h     |   1 +
 .../GenericConversationsResult/BVAnswer.m     |   4 +
 .../GenericConversationsResult/BVQuestion.h   |   1 +
 .../GenericConversationsResult/BVQuestion.m   |   7 +-
 .../Submission/BVBaseUGCSubmission.h          |   1 +
 .../Submission/Review/BVReviewSubmission.h    |   8 +
 .../Submission/Review/BVReviewSubmission.m    | 141 ++++++++++--------
 .../Video/BVUploadableYouTubeVideo.h          |  17 +++
 .../Video/BVUploadableYouTubeVideo.m          |  22 +++
 .../DisplayTests/ProfileDisplayTests.swift    |   2 +-
 .../ReviewSubmissionTests.swift               |  23 ++-
 19 files changed, 204 insertions(+), 86 deletions(-)
 create mode 100644 Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.h
 create mode 100644 Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.m

diff --git a/BVSDK.podspec b/BVSDK.podspec
index 72d07a7f..187b86d5 100644
--- a/BVSDK.podspec
+++ b/BVSDK.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name = "BVSDK"
-  s.version = '6.7.1'
+  s.version = '6.7.2'
   s.homepage = 'https://developer.bazaarvoice.com'
   s.license = { :type => 'Commercial', :text => 'See https://developer.bazaarvoice.com/API_Terms_of_Use' }
   s.author = { 'Bazaarvoice' => 'support@bazaarvoice.com' }
diff --git a/BVSDK.xcodeproj/project.pbxproj b/BVSDK.xcodeproj/project.pbxproj
index cd117218..06c2bbef 100644
--- a/BVSDK.xcodeproj/project.pbxproj
+++ b/BVSDK.xcodeproj/project.pbxproj
@@ -44,6 +44,8 @@
 		15D4F83F1DF5EC3C00E6B30D /* ph.png in Resources */ = {isa = PBXBuildFile; fileRef = 15D4F83E1DF5EC3C00E6B30D /* ph.png */; };
 		870F13421E490B5200D46BE6 /* BVCurationsPostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 870F133C1E490B5200D46BE6 /* BVCurationsPostViewController.m */; };
 		870F13641E490B7B00D46BE6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 870F13631E490B7B00D46BE6 /* Assets.xcassets */; };
+		87252B091EF46FA10011C845 /* BVUploadableYouTubeVideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 87252B071EF46FA10011C845 /* BVUploadableYouTubeVideo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		87252B0A1EF46FA10011C845 /* BVUploadableYouTubeVideo.m in Sources */ = {isa = PBXBuildFile; fileRef = 87252B081EF46FA10011C845 /* BVUploadableYouTubeVideo.m */; };
 		873DC48E1E7482840080FA03 /* BVAnalyticEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 873DC4791E7482840080FA03 /* BVAnalyticEvent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		873DC48F1E7482840080FA03 /* BVAnalyticEventManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 873DC47A1E7482840080FA03 /* BVAnalyticEventManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		873DC4901E7482840080FA03 /* BVAnalyticEventManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 873DC47B1E7482840080FA03 /* BVAnalyticEventManager.m */; };
@@ -551,6 +553,8 @@
 		870F133F1E490B5200D46BE6 /* BVCurationsUICollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVCurationsUICollectionViewCell.h; path = Pod/BVCurationsUI/BVCurationsUICollectionViewCell.h; sourceTree = SOURCE_ROOT; };
 		870F13401E490B5200D46BE6 /* BVCurationsUICollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVCurationsUICollectionViewCell.m; path = Pod/BVCurationsUI/BVCurationsUICollectionViewCell.m; sourceTree = SOURCE_ROOT; };
 		870F13631E490B7B00D46BE6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Pod/BVCurationsUI/Assets/Assets.xcassets; sourceTree = SOURCE_ROOT; };
+		87252B071EF46FA10011C845 /* BVUploadableYouTubeVideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVUploadableYouTubeVideo.h; path = Video/BVUploadableYouTubeVideo.h; sourceTree = "<group>"; };
+		87252B081EF46FA10011C845 /* BVUploadableYouTubeVideo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVUploadableYouTubeVideo.m; path = Video/BVUploadableYouTubeVideo.m; sourceTree = "<group>"; };
 		873DC4791E7482840080FA03 /* BVAnalyticEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVAnalyticEvent.h; path = BVPixelEvents/BVAnalyticEvent.h; sourceTree = "<group>"; };
 		873DC47A1E7482840080FA03 /* BVAnalyticEventManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVAnalyticEventManager.h; path = BVPixelEvents/BVAnalyticEventManager.h; sourceTree = "<group>"; };
 		873DC47B1E7482840080FA03 /* BVAnalyticEventManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVAnalyticEventManager.m; path = BVPixelEvents/BVAnalyticEventManager.m; sourceTree = "<group>"; };
@@ -1073,6 +1077,15 @@
 			path = BVCurationsUI;
 			sourceTree = "<group>";
 		};
+		87252B0B1EF46FF40011C845 /* Video */ = {
+			isa = PBXGroup;
+			children = (
+				87252B071EF46FA10011C845 /* BVUploadableYouTubeVideo.h */,
+				87252B081EF46FA10011C845 /* BVUploadableYouTubeVideo.m */,
+			);
+			name = Video;
+			sourceTree = "<group>";
+		};
 		875410A71E1F10DF006C5C6E /* BVExtensionNotifications */ = {
 			isa = PBXGroup;
 			children = (
@@ -1599,10 +1612,11 @@
 				87F2DB9F1DAD585E00FB43F3 /* BVSubmissionResponse.m */,
 				87F2DB891DAD585E00FB43F3 /* Answer */,
 				87EDAFCE1EDDCEAD00FA07C0 /* Comment */,
-				87F2DBA01DAD585E00FB43F3 /* Photo */,
 				87A02B5D1E0963020002701B /* Feedback */,
+				87F2DBA01DAD585E00FB43F3 /* Photo */,
 				87F2DBA61DAD585E00FB43F3 /* Question */,
 				87F2DBAF1DAD585E00FB43F3 /* Review */,
+				87252B0B1EF46FF40011C845 /* Video */,
 			);
 			path = Submission;
 			sourceTree = "<group>";
@@ -2244,6 +2258,7 @@
 				87EDAFD51EDDD1FD00FA07C0 /* BVSubmittedComment.h in Headers */,
 				87EDAFD91EDDD3E200FA07C0 /* BVCommentSubmissionErrorResponse.h in Headers */,
 				877AD2941EE1D134006C7070 /* BVBaseUGCSubmission.h in Headers */,
+				87252B091EF46FA10011C845 /* BVUploadableYouTubeVideo.h in Headers */,
 				87EDAFCC1EDDC9F400FA07C0 /* BVCommentSubmission.h in Headers */,
 				87F2DC241DAD585E00FB43F3 /* BVContextualInterests.h in Headers */,
 				87F2DC251DAD585E00FB43F3 /* BVGMBLSighting.h in Headers */,
@@ -2479,6 +2494,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				87252B0A1EF46FA10011C845 /* BVUploadableYouTubeVideo.m in Sources */,
 				15BE4D231E55EFCD00C12B57 /* BVSDKConfiguration.m in Sources */,
 				870F13421E490B5200D46BE6 /* BVCurationsPostViewController.m in Sources */,
 				153550AF1E898CF000C62D90 /* BVCurationsUICollectionViewCell.m in Sources */,
diff --git a/BVSDK/Info.plist b/BVSDK/Info.plist
index a1b713f3..83f8a6a0 100644
--- a/BVSDK/Info.plist
+++ b/BVSDK/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.7.1</string>
+	<string>6.7.2</string>
 	<key>CFBundleVersion</key>
-	<string>6.7.1</string>
+	<string>6.7.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>NSPrincipalClass</key>
diff --git a/Examples/BVSDKDemo/Podfile.lock b/Examples/BVSDKDemo/Podfile.lock
index 62544bc7..e52afaf5 100644
--- a/Examples/BVSDKDemo/Podfile.lock
+++ b/Examples/BVSDKDemo/Podfile.lock
@@ -5,16 +5,16 @@ PODS:
   - Bolts/AppLinks (1.8.4):
     - Bolts/Tasks
   - Bolts/Tasks (1.8.4)
-  - BVSDK/BVCurations (6.7.1):
+  - BVSDK/BVCurations (6.7.2):
     - BVSDK/Core
-  - BVSDK/BVLocation (6.7.1):
+  - BVSDK/BVLocation (6.7.2):
     - BVSDK/Core
-  - BVSDK/BVNotifications (6.7.1):
+  - BVSDK/BVNotifications (6.7.2):
     - BVSDK/BVLocation
     - BVSDK/BVPIN
-  - BVSDK/BVPIN (6.7.1):
+  - BVSDK/BVPIN (6.7.2):
     - BVSDK/Core
-  - BVSDK/Core (6.7.1)
+  - BVSDK/Core (6.7.2)
   - Crashlytics (3.8.3):
     - Fabric (~> 1.6.3)
   - Fabric (1.6.11)
@@ -88,7 +88,7 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   Bolts: 8a7995239dbe724f9cba2248b766d48b7ebdd322
-  BVSDK: 5e06b8e158dd2e67cf09315185b33a62dcad15b7
+  BVSDK: b3377e17a07986866234a2a22ed3e083ed373d66
   Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
   Fabric: 5911403591946b8228ab1c51d98f1d7137e863c6
   FBSDKCoreKit: 894b2b6eda6a4c8c4204e92e59cc355709ef045c
diff --git a/Examples/Conversations/Swift/ConversationsExample/Base.lproj/Main.storyboard b/Examples/Conversations/Swift/ConversationsExample/Base.lproj/Main.storyboard
index 56bee87b..65683885 100644
--- a/Examples/Conversations/Swift/ConversationsExample/Base.lproj/Main.storyboard
+++ b/Examples/Conversations/Swift/ConversationsExample/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="iQV-yi-M3U">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="iQV-yi-M3U">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -52,8 +52,8 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5zN-hz-DfD">
-                                <rect key="frame" x="98.5" y="424" width="178" height="30"/>
-                                <state key="normal" title="Submit Review with Photo"/>
+                                <rect key="frame" x="69.5" y="424" width="236" height="30"/>
+                                <state key="normal" title="Submit Review with Photo &amp; Video"/>
                                 <connections>
                                     <action selector="submitReviewTappedWithSender:" destination="dKM-nR-alk" eventType="touchUpInside" id="b8Z-vx-9af"/>
                                 </connections>
@@ -101,7 +101,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lar-sh-Gj0">
-                                <rect key="frame" x="101" y="617" width="172" height="30"/>
+                                <rect key="frame" x="101.5" y="617" width="172" height="30"/>
                                 <state key="normal" title="Submit Review Comment"/>
                                 <connections>
                                     <action selector="submitReviewCommentTappedWithSender:" destination="dKM-nR-alk" eventType="touchUpInside" id="GvB-Vs-pMQ"/>
@@ -297,7 +297,7 @@
                                         <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9ES-OS-FSe" id="Mix-E9-t34">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
diff --git a/Examples/Conversations/Swift/ConversationsExample/RootViewController.swift b/Examples/Conversations/Swift/ConversationsExample/RootViewController.swift
index 38515405..b8665856 100644
--- a/Examples/Conversations/Swift/ConversationsExample/RootViewController.swift
+++ b/Examples/Conversations/Swift/ConversationsExample/RootViewController.swift
@@ -36,11 +36,14 @@ class RootViewController: UIViewController {
         reviewSubmission.userId = userId
         reviewSubmission.isRecommended = true
         reviewSubmission.sendEmailAlertWhenPublished = true
-
+        
         if let photo = UIImage(named: "puppy"){
             reviewSubmission.addPhoto(photo, withPhotoCaption: "5 star pup!")
         }
         
+        // add youtube video link, if your configuration supports it
+        reviewSubmission.addVideoURL("https://www.youtube.com/watch?v=oHg5SJYRHA0", withCaption: "All your wildest dreams will come true.")
+        
         reviewSubmission.submit({ (response) in
     
             self.showAlertSuccess(message: "Success Submitting Review!")
diff --git a/Examples/Conversations/Swift/Podfile.lock b/Examples/Conversations/Swift/Podfile.lock
index 3261ce17..534fb738 100644
--- a/Examples/Conversations/Swift/Podfile.lock
+++ b/Examples/Conversations/Swift/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - BVSDK/BVConversations (6.7.1):
+  - BVSDK/BVConversations (6.7.2):
     - BVSDK/Core
-  - BVSDK/Core (6.7.1)
+  - BVSDK/Core (6.7.2)
 
 DEPENDENCIES:
   - BVSDK/BVConversations (from `../../../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../../../"
 
 SPEC CHECKSUMS:
-  BVSDK: 5e06b8e158dd2e67cf09315185b33a62dcad15b7
+  BVSDK: b3377e17a07986866234a2a22ed3e083ed373d66
 
 PODFILE CHECKSUM: ff51a28f7873cf9d401e0c25277fa303397c7510
 
diff --git a/Pod/BVCommon/BVSDKConstants.h b/Pod/BVCommon/BVSDKConstants.h
index 51fbb6c1..c16177e2 100644
--- a/Pod/BVCommon/BVSDKConstants.h
+++ b/Pod/BVCommon/BVSDKConstants.h
@@ -11,11 +11,11 @@
 
 /// Provides the master version of the SDK.
 
-#define BV_SDK_VERSION @"6.7.1"
+#define BV_SDK_VERSION @"6.7.2"
 
 /// Conversation SDK Version
 #define SDK_HEADER_NAME @"X-UA-BV-SDK"
-#define SDK_HEADER_VALUE @"IOS_SDK_V671"
+#define SDK_HEADER_VALUE @"IOS_SDK_V672"
 
 /// Error domain for NSError results, when present.
 #define BVErrDomain @"com.bvsdk.bazaarvoice"
diff --git a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.h b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.h
index 618ce2b3..e6f5cfc4 100644
--- a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.h
+++ b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.h
@@ -45,5 +45,6 @@
 @property NSDate* _Nullable submissionTime;
 @property NSDate* _Nullable lastModificationTime;
 @property NSDate* _Nullable lastModeratedTime;
+@property (readonly) BOOL isSyndicated;
 
 @end
diff --git a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.m b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.m
index 2a6e1ddc..8fd4866f 100644
--- a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.m
+++ b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVAnswer.m
@@ -40,6 +40,10 @@ -(id _Nonnull)initWithApiResponse:(NSDictionary* _Nonnull)apiResponse includes:(
         self.videos = [BVModelUtil parseVideos:apiResponse[@"Videos"]];
         self.badges = [BVModelUtil parseBadges:apiResponse[@"Badges"]];
         self.contextDataValues = [BVModelUtil parseContextDataValues:apiResponse[@"ContextDataValues"]];
+        NSNumber* isSyndicated = apiResponse[@"IsSyndicated"];
+        if(![isSyndicated isKindOfClass:[NSNull class]]) {
+            _isSyndicated = [isSyndicated boolValue];
+        }
 
     }
     return self;
diff --git a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.h b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.h
index bbd0ad6d..50b36e6e 100644
--- a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.h
+++ b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.h
@@ -53,5 +53,6 @@
 @property (nonatomic, copy) NSNumber* _Nullable totalInappropriateFeedbackCount;
 @property (nonatomic, copy) NSNumber* _Nullable totalNegativeFeedbackCount;
 @property bool isFeatured;
+@property (readonly) BOOL isSyndicated;
 
 @end
diff --git a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.m b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.m
index 25046908..58cb28be 100644
--- a/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.m
+++ b/Pod/BVConversations/Display/Model/GenericConversationsResult/BVQuestion.m
@@ -45,7 +45,12 @@ -(id)initWithApiResponse:(NSDictionary *)apiResponse includes:(BVConversationsIn
         if(![featured isKindOfClass:[NSNull class]]) {
             self.isFeatured = [featured boolValue];
         }
-        
+
+        NSNumber* isSyndicated = apiResponse[@"IsSyndicated"];
+        if(![isSyndicated isKindOfClass:[NSNull class]]) {
+            _isSyndicated = [isSyndicated boolValue];
+        }
+
         SET_IF_NOT_NULL(self.productRecommendationIds, apiResponse[@"ProductRecommendationIds"])
         SET_IF_NOT_NULL(self.productId, apiResponse[@"ProductId"])
         SET_IF_NOT_NULL(self.additionalFields, apiResponse[@"AdditionalFields"])
diff --git a/Pod/BVConversations/Submission/BVBaseUGCSubmission.h b/Pod/BVConversations/Submission/BVBaseUGCSubmission.h
index efc8eab6..b55cf8b6 100644
--- a/Pod/BVConversations/Submission/BVBaseUGCSubmission.h
+++ b/Pod/BVConversations/Submission/BVBaseUGCSubmission.h
@@ -8,6 +8,7 @@
 #import "BVSubmission.h"
 #import "BVSubmissionAction.h"
 #import "BVUploadablePhoto.h"
+#import "BVUploadableYouTubeVideo.h"
 
 /// Base class used for defining common properties for a UGC content types of the Conversations API: Reviews, Review Comments, Questions and Answers.
 @interface BVBaseUGCSubmission : BVSubmission
diff --git a/Pod/BVConversations/Submission/Review/BVReviewSubmission.h b/Pod/BVConversations/Submission/Review/BVReviewSubmission.h
index c1c47f90..cfe2dfd2 100644
--- a/Pod/BVConversations/Submission/Review/BVReviewSubmission.h
+++ b/Pod/BVConversations/Submission/Review/BVReviewSubmission.h
@@ -70,4 +70,12 @@ typedef void (^ReviewSubmissionCompletion)(BVReviewSubmissionResponse* _Nonnull
 -(void)addFreeformTagDimension:(nonnull NSString*)tagQuestionId tagNumber:(int)tagNumber value:(nonnull NSString*)value;
 - (NSString * _Nonnull)getPasskey;
 
+/**
+ Submit a Youtube video link with UGC
+     
+ @param url The full URL string of the Youtube video
+ @param videoCaption The use-provided caption for the video
+*/
+-(void)addVideoURL:(nonnull NSString*)url withCaption:(nullable NSString*)videoCaption;
+    
 @end
diff --git a/Pod/BVConversations/Submission/Review/BVReviewSubmission.m b/Pod/BVConversations/Submission/Review/BVReviewSubmission.m
index 4cef9cbe..9d0ca5d5 100644
--- a/Pod/BVConversations/Submission/Review/BVReviewSubmission.m
+++ b/Pod/BVConversations/Submission/Review/BVReviewSubmission.m
@@ -11,25 +11,26 @@
 #import "BVSDKConfiguration.h"
 
 @interface BVReviewSubmission()
+    
+    @property NSUInteger rating;
+    @property NSString* _Nonnull reviewText;
+    @property NSString* _Nonnull reviewTitle;
+    @property (readwrite) NSString* _Nonnull productId;
+    
+    @property NSMutableDictionary* _Nonnull additionalFields;
+    @property NSMutableDictionary* _Nonnull contextDataValues;
+    @property NSMutableDictionary* _Nonnull ratingQuestions;
+    @property NSMutableDictionary* _Nonnull ratingSliders;
+    @property NSMutableDictionary* _Nonnull predefinedTags;
+    @property NSMutableDictionary* _Nonnull freeformTags;
+    
+    @property NSMutableArray<BVUploadableYouTubeVideo*>* _Nonnull videos;
 
-@property NSUInteger rating;
-@property NSString* _Nonnull reviewText;
-@property NSString* _Nonnull reviewTitle;
-@property (readwrite) NSString* _Nonnull productId;
-
-@property NSMutableDictionary* _Nonnull additionalFields;
-@property NSMutableDictionary* _Nonnull contextDataValues;
-@property NSMutableDictionary* _Nonnull ratingQuestions;
-@property NSMutableDictionary* _Nonnull ratingSliders;
-@property NSMutableDictionary* _Nonnull predefinedTags;
-@property NSMutableDictionary* _Nonnull freeformTags;
-
-@property bool failureCalled;
-
-@end
+    @property BOOL failureCalled;
+    @end
 
 @implementation BVReviewSubmission
-
+    
 -(nonnull instancetype)initWithReviewTitle:(nonnull NSString*)reviewTitle reviewText:(nonnull NSString*)reviewText rating:(NSUInteger)rating productId:(nonnull NSString*)productId {
     self = [super init];
     if(self){
@@ -37,68 +38,69 @@ -(nonnull instancetype)initWithReviewTitle:(nonnull NSString*)reviewTitle review
         self.reviewText = reviewText;
         self.rating = rating;
         self.productId = productId;
-       
+        
         self.additionalFields = [NSMutableDictionary dictionary];
         self.contextDataValues = [NSMutableDictionary dictionary];
         self.ratingQuestions = [NSMutableDictionary dictionary];
         self.ratingSliders = [NSMutableDictionary dictionary];
         self.predefinedTags = [NSMutableDictionary dictionary];
         self.freeformTags = [NSMutableDictionary dictionary];
+        self.videos = [NSMutableArray array];
     }
     return self;
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#additional-field
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#additional-field
 -(void)addAdditionalField:(nonnull NSString*)fieldName value:(nonnull NSString*)value {
     NSString* key = [NSString stringWithFormat:@"additionalfield_%@", fieldName];
     self.additionalFields[key] = value;
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#context-data-question
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#context-data-question
 -(void)addContextDataValueString:(nonnull NSString*)contextDataValueName value:(nonnull NSString*)value {
     NSString* key = [NSString stringWithFormat:@"contextdatavalue_%@", contextDataValueName];
     self.contextDataValues[key] = value;
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#context-data-question
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#context-data-question
 -(void)addContextDataValueBool:(nonnull NSString*)contextDataValueName value:(bool)value {
     NSString* key = [NSString stringWithFormat:@"contextdatavalue_%@", contextDataValueName];
     self.contextDataValues[key] = value ? @"true" : @"false";
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#rating-question---normal
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#rating-question---normal
 -(void)addRatingQuestion:(nonnull NSString*)ratingQuestionName value:(int)value {
     NSString* key = [NSString stringWithFormat:@"rating_%@", ratingQuestionName];
     NSString* valueAsString = [NSString stringWithFormat:@"%i", value];
     self.ratingQuestions[key] = valueAsString;
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#rating-question---slider
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#rating-question---slider
 -(void)addRatingSlider:(nonnull NSString*)ratingQuestionName value:(nonnull NSString*)value {
     NSString* key = [NSString stringWithFormat:@"rating_%@", ratingQuestionName];
     self.ratingSliders[key] = value;
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#tags---tag-dimensions
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#tags---tag-dimensions
 -(void)addPredefinedTagDimension:(nonnull NSString*)tagQuestionId tagId:(nonnull NSString*)tagId value:(nonnull NSString*)value {
     NSString* key = [NSString stringWithFormat:@"tagid_%@/%@", tagQuestionId, tagId];
     self.predefinedTags[key] = value;
 }
-
-
-/// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#tags---tag-dimensions
+    
+    
+    /// https://developer.bazaarvoice.com/apis/conversations/tutorials/field_types#tags---tag-dimensions
 -(void)addFreeformTagDimension:(nonnull NSString*)tagQuestionId tagNumber:(int)tagNumber value:(nonnull NSString*)value {
     NSString* key = [NSString stringWithFormat:@"tag_%@_%i", tagQuestionId, tagNumber];
     self.freeformTags[key] = value;
 }
-
-
+    
+    
 -(void)submit:(nonnull ReviewSubmissionCompletion)success failure:(nonnull ConversationsFailureHandler)failure {
     
     if (self.action == BVSubmissionActionPreview) {
@@ -115,7 +117,7 @@ -(void)submit:(nonnull ReviewSubmissionCompletion)success failure:(nonnull Conve
         }];
     }
 }
-
+    
 -(void)submitPreview:(ReviewSubmissionCompletion)success failure:(ConversationsFailureHandler)failure {
     
     [self submitReviewWithPhotoUrls:BVSubmissionActionPreview
@@ -125,7 +127,7 @@ -(void)submitPreview:(ReviewSubmissionCompletion)success failure:(ConversationsF
                             failure:failure];
     
 }
-
+    
 -(void)submitForReal:(ReviewSubmissionCompletion)success failure:(ConversationsFailureHandler)failure {
     
     if ([self.photos count] == 0) {
@@ -147,10 +149,10 @@ -(void)submitForReal:(ReviewSubmissionCompletion)success failure:(ConversationsF
             
             // Queue one event for each photo uploaded.
             BVFeatureUsedEvent *photoUploadEvent = [[BVFeatureUsedEvent alloc] initWithProductId:self.productId
-                                                                       withBrand:nil
-                                                          withProductType:BVPixelProductTypeConversationsReviews
-                                                             withEventName:BVPixelFeatureUsedEventNamePhoto
-                                                            withAdditionalParams:nil];
+                                                                                       withBrand:nil
+                                                                                 withProductType:BVPixelProductTypeConversationsReviews
+                                                                                   withEventName:BVPixelFeatureUsedEventNamePhoto
+                                                                            withAdditionalParams:nil];
             
             [BVPixel trackEvent:photoUploadEvent];
             
@@ -180,8 +182,8 @@ -(void)submitForReal:(ReviewSubmissionCompletion)success failure:(ConversationsF
     }
     
 }
-
-
+    
+    
 -(void)submitReviewWithPhotoUrls:(BVSubmissionAction)action photoUrls:(nonnull NSArray<NSString*>*)photoUrls photoCaptions:(nonnull NSArray<NSString*>*)photoCaptions success:(nonnull ReviewSubmissionCompletion)success failure:(nonnull ConversationsFailureHandler)failure {
     
     
@@ -245,10 +247,10 @@ -(void)submitReviewWithPhotoUrls:(BVSubmissionAction)action photoUrls:(nonnull N
                 
                 // Fire event now that we've confirmed the event was successfully uploaded.
                 BVFeatureUsedEvent *writeReviewEvent = [[BVFeatureUsedEvent alloc] initWithProductId:self.productId
-                                                                   withBrand:nil
-                                                      withProductType:BVPixelProductTypeConversationsReviews
-                                                         withEventName:BVPixelFeatureUsedEventNameWriteReview
-                                                        withAdditionalParams:nil];
+                                                                                           withBrand:nil
+                                                                                     withProductType:BVPixelProductTypeConversationsReviews
+                                                                                       withEventName:BVPixelFeatureUsedEventNameWriteReview
+                                                                                withAdditionalParams:nil];
                 
                 [BVPixel trackEvent:writeReviewEvent];
                 
@@ -273,16 +275,16 @@ -(void)submitReviewWithPhotoUrls:(BVSubmissionAction)action photoUrls:(nonnull N
     [postDataTask resume];
     
 }
-
+    
 -(nonnull NSDictionary*)createSubmissionParameters:(BVSubmissionAction)action photoUrls:(nonnull NSArray<NSString*>*)photoUrls photoCaptions:(nonnull NSArray<NSString*>*)photoCaptions {
     
     NSMutableDictionary* parameters = [NSMutableDictionary dictionaryWithDictionary:@{
-                                           @"apiversion": @"5.4",
-                                           @"reviewtext": self.reviewText,
-                                           @"title": self.reviewTitle,
-                                           @"rating": [NSString stringWithFormat:@"%lu", (unsigned long)self.rating],
-                                           @"productId": self.productId
-                                       }];
+                                                                                      @"apiversion": @"5.4",
+                                                                                      @"reviewtext": self.reviewText,
+                                                                                      @"title": self.reviewTitle,
+                                                                                      @"rating": [NSString stringWithFormat:@"%lu", (unsigned long)self.rating],
+                                                                                      @"productId": self.productId
+                                                                                      }];
     
     parameters[@"passkey"] = [self getPasskey];
     parameters[@"action"] = [BVSubmissionActionUtil toString:action];
@@ -336,6 +338,19 @@ -(nonnull NSDictionary*)createSubmissionParameters:(BVSubmissionAction)action ph
         captionIndex += 1;
     }
     
+    int videoIndex = 1;
+    for(BVUploadableYouTubeVideo* video in self.videos) {
+        NSString* key = [NSString stringWithFormat:@"VideoUrl_%i", videoIndex];
+        parameters[key] = video.videoURL;
+        
+        if (video.videoCaption){
+            NSString* key = [NSString stringWithFormat:@"VideoCaption_%i", videoIndex];
+            parameters[key] = video.videoCaption;
+        }
+        
+        videoIndex += 1;
+    }
+    
     for (NSString* key in self.additionalFields) {
         parameters[key] = self.additionalFields[key];
     }
@@ -358,9 +373,13 @@ -(nonnull NSDictionary*)createSubmissionParameters:(BVSubmissionAction)action ph
     return parameters;
     
 }
-
+    
 - (NSString * _Nonnull)getPasskey{
     return [BVSDKManager sharedManager].configuration.apiKeyConversations;
 }
-
+    
+-(void)addVideoURL:(nonnull NSString*)url withCaption:(nullable NSString*)videoCaption {
+    BVUploadableYouTubeVideo* video = [[BVUploadableYouTubeVideo alloc] initWithVideoURL:url videoCaption:videoCaption];
+    [self.videos addObject:video];
+}
 @end
diff --git a/Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.h b/Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.h
new file mode 100644
index 00000000..840ba17b
--- /dev/null
+++ b/Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.h
@@ -0,0 +1,17 @@
+//
+//  BVUploadableYouTubeVideo.h
+//  BVSDK
+//
+//  Copyright © 2017 Bazaarvoice. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface BVUploadableYouTubeVideo : NSObject
+
+-(nonnull instancetype)initWithVideoURL:(nonnull NSString*)url videoCaption:(nullable NSString*)caption;
+
+@property (readonly) NSString* _Nonnull videoURL;
+@property (readonly) NSString* _Nullable videoCaption;
+
+@end
diff --git a/Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.m b/Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.m
new file mode 100644
index 00000000..d53b08bb
--- /dev/null
+++ b/Pod/BVConversations/Submission/Video/BVUploadableYouTubeVideo.m
@@ -0,0 +1,22 @@
+//
+//  BVUploadableYouTubeVideo.m
+//  BVSDK
+//
+//  Copyright © 2017 Bazaarvoice. All rights reserved.
+//
+
+#import "BVUploadableYouTubeVideo.h"
+
+@implementation BVUploadableYouTubeVideo
+
+-(nonnull instancetype)initWithVideoURL:(nonnull NSString*)url videoCaption:(nullable NSString*)caption; {
+    self = [super init];
+    if(self){
+        _videoURL = url;
+        _videoCaption = caption;
+    }
+    return self;
+}
+
+
+@end
diff --git a/Tests/Tests/ConversationsTests/DisplayTests/ProfileDisplayTests.swift b/Tests/Tests/ConversationsTests/DisplayTests/ProfileDisplayTests.swift
index 04f6a56b..899322eb 100644
--- a/Tests/Tests/ConversationsTests/DisplayTests/ProfileDisplayTests.swift
+++ b/Tests/Tests/ConversationsTests/DisplayTests/ProfileDisplayTests.swift
@@ -117,7 +117,7 @@ class ProfileDisplayTests: XCTestCase {
             
             // QA Statistics
             XCTAssertEqual(profile.qaStatistics?.totalAnswerCount, 29)
-            XCTAssertEqual(profile.qaStatistics?.totalQuestionCount, 33)
+            XCTAssertEqual(profile.qaStatistics?.totalQuestionCount, 34)
             XCTAssertEqual(profile.qaStatistics?.answerHelpfulVoteCount, 0)
             XCTAssertEqual(profile.qaStatistics?.helpfulVoteCount, 0)
             XCTAssertEqual(profile.qaStatistics?.answerHelpfulVoteCount, 0)
diff --git a/Tests/Tests/ConversationsTests/SubmissionTests/ReviewSubmissionTests.swift b/Tests/Tests/ConversationsTests/SubmissionTests/ReviewSubmissionTests.swift
index 8907a0f9..a341fcb9 100644
--- a/Tests/Tests/ConversationsTests/SubmissionTests/ReviewSubmissionTests.swift
+++ b/Tests/Tests/ConversationsTests/SubmissionTests/ReviewSubmissionTests.swift
@@ -52,7 +52,28 @@ class ReviewSubmissionTests: XCTestCase {
         
         waitForExpectations(timeout: 10, handler: nil)
     }
-
+    
+    let VIDEO_URL = "https://www.youtube.com/watch?v=oHg5SJYRHA0"
+    let VIDEO_CAPTION = "yo dawg"
+    
+    func testPreviewReviewWithVideo() {
+        
+        let expectation = self.expectation(description: "testPreviewReviewWithVideo")
+        
+        let review = self.fillOutReview(.preview)
+        review.addVideoURL(VIDEO_URL, withCaption: VIDEO_CAPTION)
+        review.submit({ (reviewSubmission) in
+            // When run in Preview mode, we get the formFields that can be used for submission.
+            
+            XCTAssertTrue(reviewSubmission.formFields?.keys.count == 50)
+            expectation.fulfill()
+        }, failure: { (errors) in
+            XCTFail()
+            expectation.fulfill()
+        })
+        
+        waitForExpectations(timeout: 10, handler: nil)
+    }
     
     func fillOutReview(_ action : BVSubmissionAction) -> BVReviewSubmission {
         let review = BVReviewSubmission(reviewTitle: "review title",