From a6d1303fb4b8484aa8626d973d75721f16a69b8c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 24 Jul 2020 16:40:33 -0700 Subject: [PATCH] nit --- .../voting/results/Pages/Index.razor | 20 +- .../azure-functions/voting/results/Program.cs | 1 + .../voting/vote/appsettings.json | 2 +- .../voting/worker-function/.gitignore | 264 ------------------ .../voting/worker-function/GetResults.cs | 11 +- .../voting/worker-function/QueueTrigger.cs | 1 - .../voting/worker-function/Startup.cs | 1 + .../worker-function/local.settings.json | 7 + 8 files changed, 30 insertions(+), 277 deletions(-) delete mode 100644 samples/azure-functions/voting/worker-function/.gitignore create mode 100644 samples/azure-functions/voting/worker-function/local.settings.json diff --git a/samples/azure-functions/voting/results/Pages/Index.razor b/samples/azure-functions/voting/results/Pages/Index.razor index fff44a3a..eaf3b0d9 100644 --- a/samples/azure-functions/voting/results/Pages/Index.razor +++ b/samples/azure-functions/voting/results/Pages/Index.razor @@ -79,20 +79,22 @@ try { var response = await _client.GetStringAsync(Configuration.GetServiceUri("worker")!.AbsoluteUri + "api/GetResults"); - var results = JsonSerializer.Deserialize(response); - //Reset votes because if there are zero votes there will be no entry from the query. DogVotes = new VotingResult { Vote = "a", Count = 0 }; CatVotes = new VotingResult { Vote = "b", Count = 0 }; - foreach (var vote in results) + if (!string.IsNullOrEmpty(response)) { - if (vote.Vote == "a") + var results = JsonSerializer.Deserialize(response); + foreach (var vote in results) { - DogVotes = vote; - } - else - { - CatVotes = vote; + if (vote.Vote == "a") + { + DogVotes = vote; + } + else + { + CatVotes = vote; + } } } diff --git a/samples/azure-functions/voting/results/Program.cs b/samples/azure-functions/voting/results/Program.cs index 84a9e2a7..2c9af2b5 100644 --- a/samples/azure-functions/voting/results/Program.cs +++ b/samples/azure-functions/voting/results/Program.cs @@ -24,5 +24,6 @@ namespace Results { webBuilder.UseStartup(); }); + } } diff --git a/samples/azure-functions/voting/vote/appsettings.json b/samples/azure-functions/voting/vote/appsettings.json index f5b87720..065c8881 100644 --- a/samples/azure-functions/voting/vote/appsettings.json +++ b/samples/azure-functions/voting/vote/appsettings.json @@ -7,6 +7,6 @@ } }, "AllowedHosts": "*", - "OptionA": "Dogs", + "OptionA": "wolffff", "OptionB": "Cats" } diff --git a/samples/azure-functions/voting/worker-function/.gitignore b/samples/azure-functions/voting/worker-function/.gitignore deleted file mode 100644 index ff5b00c5..00000000 --- a/samples/azure-functions/voting/worker-function/.gitignore +++ /dev/null @@ -1,264 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# Azure Functions localsettings file -local.settings.json - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -project.fragment.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -#*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc \ No newline at end of file diff --git a/samples/azure-functions/voting/worker-function/GetResults.cs b/samples/azure-functions/voting/worker-function/GetResults.cs index e9be5d2f..cd0f0fc0 100644 --- a/samples/azure-functions/voting/worker-function/GetResults.cs +++ b/samples/azure-functions/voting/worker-function/GetResults.cs @@ -30,8 +30,15 @@ namespace worker_function log.LogInformation(_configuration.GetConnectionString("postgres")); using (var connection = new NpgsqlConnection(_configuration.GetConnectionString("postgres"))) { - var newResults = await connection.QueryAsync("SELECT Vote, COUNT(Id) AS Count FROM votes GROUP BY Vote ORDER BY Vote"); - return new OkObjectResult(JsonSerializer.Serialize(newResults)); + try + { + var newResults = await connection.QueryAsync("SELECT Vote, COUNT(Id) AS Count FROM votes GROUP BY Vote ORDER BY Vote"); + return new OkObjectResult(JsonSerializer.Serialize(newResults)); + } + catch (Exception ex) + { + return new OkResult(); + } } } } diff --git a/samples/azure-functions/voting/worker-function/QueueTrigger.cs b/samples/azure-functions/voting/worker-function/QueueTrigger.cs index a4f94fc8..5c7f8f03 100644 --- a/samples/azure-functions/voting/worker-function/QueueTrigger.cs +++ b/samples/azure-functions/voting/worker-function/QueueTrigger.cs @@ -26,7 +26,6 @@ namespace worker_function using (var connection = new NpgsqlConnection(_configuration.GetConnectionString("postgres"))) { var vote = JsonSerializer.Deserialize(data); - // TODO connection.Open(); await connection.ExecuteAsync(@"CREATE TABLE IF NOT EXISTS votes ( Id VARCHAR(255) NOT NULL UNIQUE, diff --git a/samples/azure-functions/voting/worker-function/Startup.cs b/samples/azure-functions/voting/worker-function/Startup.cs index 0e141a3c..a3d79539 100644 --- a/samples/azure-functions/voting/worker-function/Startup.cs +++ b/samples/azure-functions/voting/worker-function/Startup.cs @@ -10,6 +10,7 @@ namespace worker_function // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public override void Configure(IFunctionsHostBuilder builder) { + } } } \ No newline at end of file diff --git a/samples/azure-functions/voting/worker-function/local.settings.json b/samples/azure-functions/voting/worker-function/local.settings.json new file mode 100644 index 00000000..5f95af71 --- /dev/null +++ b/samples/azure-functions/voting/worker-function/local.settings.json @@ -0,0 +1,7 @@ +{ + "IsEncrypted": false, + "Values": { + "FUNCTIONS_WORKER_RUNTIME": "dotnet", + "AzureWebJobsStorage": "UseDevelopmentStorage=true" + } + } \ No newline at end of file