chore: code review

Author: eugbyte

deploy/Terraform/container-app.tf

@@ -82,7 +82,7 @@ resource "azurerm_container_app" "app" {
     server   = azurerm_container_registry.acr.login_server
     identity = azurerm_user_assigned_identity.uami.id
   }
-  
+
   depends_on = [azurerm_role_assignment.acr_pull, azurerm_mssql_database.db]
 
   # needed for container app to access other Microsoft Entra protected resources
@@ -179,6 +179,16 @@ resource "azurerm_container_app" "app" {
         name  = "ASPNETCORE_ENVIRONMENT"
         value = "Production"
       }
+
+      env {
+        name        = "AzureAIFoundry__ContentSafetyKey"
+        secret_name = "content-safety-key"
+      }
+
+      env {
+        name  = "AzureAIFoundry__ContentSafetyEndpoint"
+        value = var.content_safety_api
+      }
     }
   }
 
@@ -216,4 +226,9 @@ resource "azurerm_container_app" "app" {
     value = var.smtp_password
   }
 
+  secret {
+    name  = "content-safety-key"
+    value = var.content_safety_key
+  }
+
 }

deploy/Terraform/variables.tf

@@ -35,3 +35,14 @@ variable "smtp_password" {
   type        = string
   sensitive   = true
 }
+
+variable "content_safety_key" {
+  description = "Azure AI foundry content safety key"
+  type        = string
+  sensitive   = true
+}
+
+variable "content_safety_api" {
+  description = "Azure AI foundry content safety api endpoint"
+  type        = string
+}

src/Evently.Server/Common/Extensions/LoggerExtension.cs

@@ -28,4 +28,12 @@ public static partial void LogSuccessEmail(
 		Message = "Error occurred at {context}: {errorMsg}")]
 	public static partial void LogErrorContext(
 		this ILogger logger, string context, string errorMsg);
+	
+	[LoggerMessage(
+		EventId = 5,
+		Level = LogLevel.Error,
+		Message = "Analyze image failed. Status code: {statusCode}, Error code: {errorCode}, Error message: {errMsg}")]
+	public static partial void LogContentModerationError(
+		this ILogger logger, string statusCode, string errorCode, string errMsg);
+	//
 }

src/Evently.Server/Features/Files/Services/ObjectStorageService.cs

@@ -4,6 +4,7 @@
 using Azure.Storage.Blobs.Models;
 using Evently.Server.Common.Domains.Interfaces;
 using Evently.Server.Common.Domains.Models;
+using Evently.Server.Common.Extensions;
 using Microsoft.Extensions.Options;
 
 namespace Evently.Server.Features.Files.Services;
@@ -77,7 +78,7 @@ public async Task<bool> PassesContentModeration(BinaryData binaryData) {
 		try {
 			response = await _contentSafetyClient.AnalyzeImageAsync(request);
 		} catch (RequestFailedException ex) {
-			Console.WriteLine("Analyze image failed.\nStatus code: {0}, Error code: {1}, Error message: {2}", ex.Status, ex.ErrorCode, ex.Message);
+			logger.LogContentModerationError(ex.Status.ToString(), ex.ErrorCode ?? "", ex.Message);
 			throw;
 		}
 
@@ -86,6 +87,6 @@ public async Task<bool> PassesContentModeration(BinaryData binaryData) {
 			             .Select(v => v.Severity)
 			             .Aggregate((a, b) => a + b)
 		             ?? 0;
-		return result.CategoriesAnalysis.Count != 0 && score == 0;
+		return score == 0;
 	}
 }

src/Evently.Server/Features/Gatherings/Controllers/GatheringsController.cs

@@ -68,8 +68,8 @@ public async Task<ActionResult<Gathering>> CreateGathering([FromForm] GatheringR
 		}
 
 		if (coverImg != null) {
-			Uri uri = await UploadCoverImage(gatheringReqDto.GatheringId, coverImg: coverImg ?? throw new ArgumentNullException(nameof(coverImg)));
-			gatheringReqDto = gatheringReqDto with { CoverSrc = uri.AbsoluteUri };
+			string uri = await UploadCoverImage(gatheringReqDto.GatheringId, coverImg);
+			gatheringReqDto = gatheringReqDto with { CoverSrc = uri };
 		}
 
 		Gathering gathering = await gatheringService.CreateGathering(gatheringReqDto);
@@ -88,9 +88,8 @@ public async Task<ActionResult> UpdateGathering(long gatheringId, [FromForm] Gat
 		}
 
 		if (coverImg != null) {
-			Uri uri = await UploadCoverImage(gatheringReqDto.GatheringId, coverImg);
-			gathering.CoverSrc = uri.AbsoluteUri;
-			gatheringReqDto = gatheringReqDto with { CoverSrc = uri.AbsoluteUri };
+			string uri = await UploadCoverImage(gatheringReqDto.GatheringId, coverImg);
+			gatheringReqDto = gatheringReqDto with { CoverSrc = uri };
 		}
 
 		gathering = await gatheringService.UpdateGathering(gatheringId, gatheringReqDto);
@@ -112,16 +111,17 @@ public async Task<ActionResult<Gathering>> DeleteGathering(long gatheringId) {
 		return NoContent();
 	}
 
-	private async Task<Uri> UploadCoverImage(long gatheringId, IFormFile coverImg) {
+	private async Task<string> UploadCoverImage(long gatheringId, IFormFile coverImg) {
 		string fileName = $"gatherings/{gatheringId}/cover-image{Path.GetExtension(coverImg.FileName)}";
 		BinaryData binaryData = await coverImg.ToBinaryData();
 		bool isContentSafe = await objectStorageService.PassesContentModeration(binaryData);
 		if (!isContentSafe) {
-			return new Uri(string.Empty, UriKind.RelativeOrAbsolute);
+			return string.Empty;
 		}
-		return await objectStorageService.UploadFile(_containerName,
+		Uri uri = await objectStorageService.UploadFile(_containerName,
 			fileName,
 			binaryData,
 			mimeType: MimeTypes.GetMimeType(coverImg.FileName));
+		return uri.AbsoluteUri;
 	}
 }

src/evently.client/src/lib/components/card.tsx

@@ -18,7 +18,6 @@ export function Card({ gathering, accountId }: CardProps): JSX.Element {
 		(detail) => detail.category
 	);
 
-	// ignore img-src for now
 	if (imgSrc == null || imgSrc.length === 0) {
 		const hash: number = hashString(gathering.name);
 		imgSrc = hash % 2 === 0 ? Placeholder1 : Placeholder2;