Skip to content

Commit 705efbd

Browse files
Merge pull request #9 from palkalaiselvand/additional-changes-from-review
completed changes
2 parents 572b51d + 6b6fef2 commit 705efbd

File tree

17 files changed

+14
-10
lines changed

17 files changed

+14
-10
lines changed
0 Bytes
Binary file not shown.

.vs/SampleFunctionApp/v16/.suo

16.5 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

SampleApp.Shared/AzureAssets/ServiceBusFactory.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ private async Task SendMessageToTopic<T>(T message, AzureMessageContext context)
9797
}
9898
private Message FormatMessage<T>(T queueMessage)
9999
{
100-
Message message = new Message(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(queueMessage)))
100+
var type = queueMessage.GetType();
101+
string data = type.Name == "String" ? queueMessage.ToString() : JsonConvert.SerializeObject(queueMessage);
102+
Message message = new Message(Encoding.UTF8.GetBytes(data))
101103
{
102104
MessageId = Guid.NewGuid().ToString(),
103105
SessionId = Guid.NewGuid().ToString()

SampleApp.Shared/AzureAssets/StorageQueueFactory.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ public async Task SendMessages<T>(List<T> messages, AzureMessageContext context)
4949
}
5050
}
5151

52-
private async Task<bool> AddMessageAsync<T>(string queue, T message)
52+
private async Task<bool> AddMessageAsync<T>(string queue, T queueMessage)
5353
{
54+
var type = queueMessage.GetType();
55+
string data = type.Name == "String" ? queueMessage.ToString() : JsonConvert.SerializeObject(queueMessage);
5456
var cloudQueue = _cloudQueueClient.GetQueueReference(queue.ToLower());
5557
await Policy
5658
.Handle<StorageException>()
@@ -60,7 +62,7 @@ await Policy
6062
})
6163
.ExecuteAsync(async () =>
6264
{
63-
await cloudQueue.AddMessageAsync(new CloudQueueMessage(JsonConvert.SerializeObject(message)));
65+
await cloudQueue.AddMessageAsync(new CloudQueueMessage(data));
6466
});
6567
return true;
6668
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

SampleFunctionApp/HttpTrigger/UserDetailsTrigger.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ public async Task<IActionResult> Work(HttpRequest req, ILogger logger)
6161

6262
//Audit the request for suppoert purpose
6363

64-
await _audit.Create(new RequestAudit { RequestId = requestId, Data = requestBody });
64+
//await _audit.Create(new RequestAudit { RequestId = requestId, Data = requestBody });
6565

66-
var data = JsonConvert.DeserializeObject<UserDetails>(requestBody);
66+
//var data = JsonConvert.DeserializeObject<UserDetails>(requestBody);
6767

68-
data.Id = requestId;
69-
await _engine.Process(data);
68+
//data.Id = requestId;
69+
//await _engine.Process(data);
7070

7171
var azureContext = AzureAssets.GetAzureAssets(Environment.GetEnvironmentVariable(AppSettingsKey.AzureQueueAssets));
72-
72+
var data = requestBody;
7373

7474
if (azureContext.AssetsType == AssetsType.ServiceBus)
7575
{

SampleFunctionApp/local.settings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
55
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
66
"SampleApp_ConnectionString": "Data Source=(localdb)\\ProjectsV13;Initial Catalog=SampleApp;Integrated Security=True;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
7-
"SampleApp_ServiceBus_ConnectionString": "Endpoint=sb://developmentaccount.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=2m+dy8rXboZmHrDdqkDod46Hg/DThH9aYEM1ZYFWUpoE=",
7+
"SampleApp_ServiceBus_ConnectionString": "Endpoint=sb://developmentaccount.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=2m+dy8rXboZmHrDdqkDod46Hg/DThH9aYEM1ZYFWUpo=",
88
"SampleApp_ServiceBus_QueueName": "sbuserdetailsqueue",
99
"SampleApp_ServiceBus_TopicName": "sbuserdetailstopic",
10-
"SampleApp_StorageAccount_ConnectionString": "DefaultEndpointsProtocol=https;AccountName=storaccpocctr;AccountKey=SzlfpjbTy+VpR0DqJHt6Wb4/TP1MEPV0eIsjHepxSxXQ5e3RitFTwwz5clAxWxXAloNO2Hc2yZvePHks65I/qgJ==;EndpointSuffix=core.windows.net",
10+
"SampleApp_StorageAccount_ConnectionString": "DefaultEndpointsProtocol=https;AccountName=storaccpocctr;AccountKey=SzlfpjbTy+VpR0DqJHt6Wb4/TP1MEPV0eIsjHepxSxXQ5e3RitFTwwz5clAxWxXAloNO2Hc2yZvePHks65I/qg==;EndpointSuffix=core.windows.net",
1111
"SampleApp_StorageQueueName": "squserdetailsqueue",
1212
"AzureQueueAssets": "ServiceBus|Queue"
1313
}

0 commit comments

Comments
 (0)