From 3e38889adaf6b37107cec314b604fa3506bea03e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boris=20Mila=C5=A1inovi=C4=87?= <boris.milasinovic@fer.hr>
Date: Wed, 22 Apr 2026 22:49:47 +0200
Subject: [PATCH] Add JSON function to models

---
 DataAccess/EF_Demo/Data/DbJson.cs             |  7 ++++++
 .../Data/MSSQL/EventsContext.Custom.cs        | 14 +++++++++++
 .../Data/Postgres/EventsContext.Custom.cs     | 14 +++++++++++
 DataAccess/EF_Demo/Demo.cs                    | 12 ++++++++--
 DataAccess/EF_Demo/EF_Demo.sln                | 24 +++++++++++++++++++
 5 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 DataAccess/EF_Demo/Data/DbJson.cs
 create mode 100644 DataAccess/EF_Demo/Data/MSSQL/EventsContext.Custom.cs
 create mode 100644 DataAccess/EF_Demo/Data/Postgres/EventsContext.Custom.cs
 create mode 100644 DataAccess/EF_Demo/EF_Demo.sln

diff --git a/DataAccess/EF_Demo/Data/DbJson.cs b/DataAccess/EF_Demo/Data/DbJson.cs
new file mode 100644
index 0000000..b193522
--- /dev/null
+++ b/DataAccess/EF_Demo/Data/DbJson.cs
@@ -0,0 +1,7 @@
+namespace EF_Demo.Data;
+
+internal static class DbJson
+{
+  public static string? JsonValue(string? expression, string path)
+    => throw new NotSupportedException();
+}
diff --git a/DataAccess/EF_Demo/Data/MSSQL/EventsContext.Custom.cs b/DataAccess/EF_Demo/Data/MSSQL/EventsContext.Custom.cs
new file mode 100644
index 0000000..2489b29
--- /dev/null
+++ b/DataAccess/EF_Demo/Data/MSSQL/EventsContext.Custom.cs
@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace EF_Demo.Data.MSSQL;
+
+public partial class EventsContext
+{
+  partial void OnModelCreatingPartial(ModelBuilder modelBuilder)
+  {
+    modelBuilder
+      .HasDbFunction(typeof(DbJson).GetMethod(nameof(DbJson.JsonValue))!)
+      .HasName("JSON_VALUE")
+      .IsBuiltIn();
+  }
+}
diff --git a/DataAccess/EF_Demo/Data/Postgres/EventsContext.Custom.cs b/DataAccess/EF_Demo/Data/Postgres/EventsContext.Custom.cs
new file mode 100644
index 0000000..07132b7
--- /dev/null
+++ b/DataAccess/EF_Demo/Data/Postgres/EventsContext.Custom.cs
@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace EF_Demo.Data.Postgres;
+
+public partial class EventsContext
+{
+  partial void OnModelCreatingPartial(ModelBuilder modelBuilder)
+  {
+    modelBuilder
+      .HasDbFunction(typeof(DbJson).GetMethod(nameof(DbJson.JsonValue))!)
+      .HasName("jsonb_extract_path_text")
+      .IsBuiltIn();
+  }
+}
diff --git a/DataAccess/EF_Demo/Demo.cs b/DataAccess/EF_Demo/Demo.cs
index 68780bc..96a04e5 100644
--- a/DataAccess/EF_Demo/Demo.cs
+++ b/DataAccess/EF_Demo/Demo.cs
@@ -5,6 +5,7 @@ using EF_Demo.Data.MSSQL;
 #endif
 
 using EF_Demo.Models;
+using EF_Demo.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
@@ -86,6 +87,12 @@ internal class Demo(IDbContextFactory<EventsContext> contextFactory, ILogger<Dem
   /// </summary>
   internal void PrintPeople(int year)
   {
+#if POSTGRES
+    const string hrPath = "hr";
+#else
+    const string hrPath = "$.hr";
+#endif
+
     using var ctx = contextFactory.CreateDbContext();
     var query = ctx.People
                    .Where(p => p.BirthDate.Year == year)
@@ -97,11 +104,12 @@ internal class Demo(IDbContextFactory<EventsContext> contextFactory, ILogger<Dem
                      p.FirstName, p.LastName,
                      p.FirstNameTranscription, p.LastNameTranscription,
                      p.BirthDate,
-                     Country = p.CountryCodeNavigation.Name
+                     Country = p.CountryCodeNavigation.Name,
+                     CountryHr = DbJson.JsonValue(p.CountryCodeNavigation.Translations, hrPath)
                    });
     foreach (var p in query)
     {
-      Console.WriteLine($"{p.FirstName} {p.LastName} ({p.FirstNameTranscription} {p.LastNameTranscription}), {p.Country} {p.BirthDate:dd.MM.yyyy.}");
+      Console.WriteLine($"{p.FirstName} {p.LastName} ({p.FirstNameTranscription} {p.LastNameTranscription}), {p.Country} / {p.CountryHr} {p.BirthDate:dd.MM.yyyy.}");
     }
   }
 }
diff --git a/DataAccess/EF_Demo/EF_Demo.sln b/DataAccess/EF_Demo/EF_Demo.sln
new file mode 100644
index 0000000..22acb5c
--- /dev/null
+++ b/DataAccess/EF_Demo/EF_Demo.sln
@@ -0,0 +1,24 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.2.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EF_Demo", "EF_Demo.csproj", "{C3669BE8-62DC-69A4-DA79-08849870583B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C3669BE8-62DC-69A4-DA79-08849870583B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3669BE8-62DC-69A4-DA79-08849870583B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3669BE8-62DC-69A4-DA79-08849870583B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3669BE8-62DC-69A4-DA79-08849870583B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {ABA15D2D-3AA6-49A6-AA81-E01BF14115A9}
+	EndGlobalSection
+EndGlobal