Update the logic associated with the mustUseAdvisory flag in Providers.

Author: rafidzal

Code/Sif3Framework/Sif.Framework/Providers/BasicProvider.cs

@@ -70,6 +70,7 @@ public override IHttpActionResult Post(List<T> objs, [MatrixParameter] string[]
 
             try
             {
+                bool? mustUseAdvisory = HttpUtils.GetMustUseAdvisory(Request.Headers);
 
                 foreach (T obj in objs)
                 {
@@ -79,37 +80,26 @@ public override IHttpActionResult Post(List<T> objs, [MatrixParameter] string[]
 
                     try
                     {
-                        bool? mustUseAdvisory = HttpUtils.GetMustUseAdvisory(Request.Headers);
 
-                        if (hasAdvisoryId)
+                        if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
                         {
 
-                            if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
+                            if (hasAdvisoryId)
                             {
                                 status.id = service.Create(obj, mustUseAdvisory, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0])).RefId;
                                 status.statusCode = ((int)HttpStatusCode.Created).ToString();
                             }
                             else
                             {
-                                status.error = ProviderUtils.CreateError(HttpStatusCode.BadRequest, typeof(T).Name, "Create request failed as object ID provided (" + obj.RefId + "), but mustUseAdvisory is not specified or is false.");
+                                status.error = ProviderUtils.CreateError(HttpStatusCode.BadRequest, typeof(T).Name, "Create request failed as object ID is not provided, but mustUseAdvisory is true.");
                                 status.statusCode = ((int)HttpStatusCode.BadRequest).ToString();
                             }
 
                         }
                         else
                         {
-
-                            if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
-                            {
-                                status.error = ProviderUtils.CreateError(HttpStatusCode.BadRequest, typeof(T).Name, "Create request failed as object ID is not provided, but mustUseAdvisory is true.");
-                                status.statusCode = ((int)HttpStatusCode.BadRequest).ToString();
-                            }
-                            else
-                            {
-                                status.id = service.Create(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0])).RefId;
-                                status.statusCode = ((int)HttpStatusCode.Created).ToString();
-                            }
-
+                            status.id = service.Create(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0])).RefId;
+                            status.statusCode = ((int)HttpStatusCode.Created).ToString();
                         }
 
                     }

Code/Sif3Framework/Sif.Framework/Providers/FunctionalServiceProvider.cs

@@ -91,12 +91,6 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
                     return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Service " + serviceName + " does not handle jobs named " + jobName);
                 }
 
-                if (hasAdvisoryId && !mustUseAdvisory)
-                {
-                    return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Request failed for creating job for " + serviceName + " as object ID provided (" + item.id + "), but mustUseAdvisory is not specified or is false.\n" +
-                        !Guid.Empty.ToString().Equals(item.id));
-                }
-
                 if (!hasAdvisoryId && mustUseAdvisory)
                 {
                     return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Request requires use of advisory id, but none has been supplied.");

Code/Sif3Framework/Sif.Framework/Providers/Provider.cs

@@ -108,35 +108,26 @@ public virtual IHttpActionResult Post(TSingle obj, [MatrixParameter] string[] zo
                 bool hasAdvisoryId = !string.IsNullOrWhiteSpace(obj.RefId);
                 bool? mustUseAdvisory = HttpUtils.GetMustUseAdvisory(Request.Headers);
 
-                if (hasAdvisoryId)
+                if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
                 {
 
-                    if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
+                    if (hasAdvisoryId)
                     {
                         TSingle createdObject = service.Create(obj, mustUseAdvisory, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
                         string uri = Url.Link("DefaultApi", new { controller = typeof(TSingle).Name, id = createdObject.RefId });
                         result = Created(uri, createdObject);
                     }
                     else
                     {
-                        result = BadRequest("Request failed for object " + typeof(TSingle).Name + " as object ID provided (" + obj.RefId + "), but mustUseAdvisory is not specified or is false.");
+                        result = BadRequest("Request failed for object " + typeof(TSingle).Name + " as object ID is not provided, but mustUseAdvisory is true.");
                     }
 
                 }
                 else
                 {
-
-                    if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
-                    {
-                        result = BadRequest("Request failed for object " + typeof(TSingle).Name + " as object ID is not provided, but mustUseAdvisory is true.");
-                    }
-                    else
-                    {
-                        TSingle createdObject = service.Create(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
-                        string uri = Url.Link("DefaultApi", new { controller = typeof(TSingle).Name, id = createdObject.RefId });
-                        result = Created(uri, createdObject);
-                    }
-
+                    TSingle createdObject = service.Create(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
+                    string uri = Url.Link("DefaultApi", new { controller = typeof(TSingle).Name, id = createdObject.RefId });
+                    result = Created(uri, createdObject);
                 }
 
             }