mirror of
https://github.com/aaronpo97/the-biergarten-app.git
synced 2026-02-16 02:39:03 +00:00
Update stored procs/udf and update docker config
This commit is contained in:
Aaron Po
13
.config/dotnet-tools.json
Normal file
13
.config/dotnet-tools.json
Normal file
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"version": 1,
|
||||
"isRoot": true,
|
||||
"tools": {
|
||||
"csharpier": {
|
||||
"version": "1.2.1",
|
||||
"commands": [
|
||||
"csharpier"
|
||||
],
|
||||
"rollForward": false
|
||||
}
|
||||
}
|
||||
}
|
||||
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"dotnet.defaultSolution": "SeedDB.sln"
|
||||
}
|
||||
@@ -1,9 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
namespace DataAccessLayer;
|
||||
|
||||
public class Class1
|
||||
{
|
||||
|
||||
}
|
||||
public class Class1 { }
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -51,7 +51,7 @@ CREATE TABLE UserAccount
|
||||
UNIQUE (Username),
|
||||
|
||||
CONSTRAINT AK_Email
|
||||
UNIQUE (Email),
|
||||
UNIQUE (Email)
|
||||
|
||||
);
|
||||
|
||||
@@ -233,12 +233,15 @@ CREATE TABLE Country
|
||||
|
||||
CountryName NVARCHAR(100) NOT NULL,
|
||||
|
||||
CountryCode CHAR(3) NOT NULL,
|
||||
ISO3616_1 CHAR(2) NOT NULL,
|
||||
|
||||
Timer ROWVERSION,
|
||||
|
||||
CONSTRAINT PK_Country
|
||||
PRIMARY KEY (CountryID),
|
||||
|
||||
CONSTRAINT AK_Country_ISO3616_1
|
||||
UNIQUE (ISO3616_1)
|
||||
);
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
@@ -251,6 +254,9 @@ CREATE TABLE StateProvince
|
||||
|
||||
StateProvinceName NVARCHAR(100) NOT NULL,
|
||||
|
||||
ISO3616_2 CHAR(6) NOT NULL,
|
||||
-- eg 'US-CA' for California, 'CA-ON' for Ontario
|
||||
|
||||
CountryID UNIQUEIDENTIFIER NOT NULL,
|
||||
|
||||
Timer ROWVERSION,
|
||||
@@ -258,11 +264,16 @@ CREATE TABLE StateProvince
|
||||
CONSTRAINT PK_StateProvince
|
||||
PRIMARY KEY (StateProvinceID),
|
||||
|
||||
CONSTRAINT AK_StateProvince_ISO3616_2
|
||||
UNIQUE (ISO3616_2),
|
||||
|
||||
CONSTRAINT FK_StateProvince_Country
|
||||
FOREIGN KEY (CountryID)
|
||||
REFERENCES Country(CountryID)
|
||||
);
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_StateProvince_Country
|
||||
ON StateProvince(CountryID);
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
----------------------------------------------------------------------------
|
||||
@@ -280,8 +291,15 @@ CREATE TABLE City
|
||||
|
||||
CONSTRAINT PK_City
|
||||
PRIMARY KEY (CityID),
|
||||
|
||||
CONSTRAINT FK_City_StateProvince
|
||||
FOREIGN KEY (StateProvinceID)
|
||||
REFERENCES StateProvince(StateProvinceID)
|
||||
);
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_City_StateProvince
|
||||
ON City(StateProvinceID);
|
||||
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
----------------------------------------------------------------------------
|
||||
@@ -302,25 +320,60 @@ CREATE TABLE BreweryPost -- A user cannot be deleted if they have a post
|
||||
|
||||
Timer ROWVERSION,
|
||||
|
||||
CityID UNIQUEIDENTIFIER NOT NULL,
|
||||
|
||||
Coordinates GEOGRAPHY NOT NULL,
|
||||
|
||||
CONSTRAINT PK_BreweryPost
|
||||
PRIMARY KEY (BreweryPostID),
|
||||
|
||||
CONSTRAINT FK_BreweryPost_UserAccount
|
||||
FOREIGN KEY (PostedByID)
|
||||
REFERENCES UserAccount(UserAccountID)
|
||||
ON DELETE NO ACTION
|
||||
ON DELETE NO ACTION,
|
||||
|
||||
)
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_BreweryPost_PostedByID
|
||||
ON BreweryPost(PostedByID);
|
||||
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
----------------------------------------------------------------------------
|
||||
----------------------------------------------------------------------------
|
||||
CREATE TABLE BreweryPostLocation (
|
||||
BreweryPostLocationID UNIQUEIDENTIFIER
|
||||
CONSTRAINT DF_BreweryPostLocationID DEFAULT NEWID(),
|
||||
|
||||
BreweryPostID UNIQUEIDENTIFIER NOT NULL,
|
||||
|
||||
AddressLine1 NVARCHAR(256) NOT NULL,
|
||||
|
||||
AddressLine2 NVARCHAR(256),
|
||||
|
||||
PostalCode NVARCHAR(20) NOT NULL,
|
||||
|
||||
CityID UNIQUEIDENTIFIER NOT NULL,
|
||||
|
||||
Coordinates GEOGRAPHY NOT NULL,
|
||||
|
||||
Timer ROWVERSION,
|
||||
|
||||
CONSTRAINT PK_BreweryPostLocation
|
||||
PRIMARY KEY (BreweryPostLocationID),
|
||||
|
||||
CONSTRAINT AK_BreweryPostLocation_BreweryPostID
|
||||
UNIQUE (BreweryPostID),
|
||||
|
||||
CONSTRAINT FK_BreweryPostLocation_BreweryPost
|
||||
FOREIGN KEY (BreweryPostID)
|
||||
REFERENCES BreweryPost(BreweryPostID)
|
||||
ON DELETE CASCADE
|
||||
);
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_BreweryPostLocation_BreweryPost
|
||||
ON BreweryPostLocation(BreweryPostID);
|
||||
|
||||
CREATE NONCLUSTERED INDEX IX_BreweryPostLocation_City
|
||||
ON BreweryPostLocation(CityID);
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
----------------------------------------------------------------------------
|
||||
|
||||
CREATE TABLE BreweryPostPhoto -- All photos linked to a post are deleted if the post is deleted
|
||||
(
|
||||
BreweryPostPhotoID UNIQUEIDENTIFIER
|
||||
@@ -500,13 +553,6 @@ CREATE TABLE BeerPostComment
|
||||
CREATE NONCLUSTERED INDEX IX_BeerPostComment_BeerPost
|
||||
ON BeerPostComment(BeerPostID)
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
-----------------------------------------------------------------------------
|
||||
|
||||
USE Biergarten;
|
||||
SELECT *
|
||||
FROM UserAccount;
|
||||
SELECT *
|
||||
FROM UserCredential;
|
||||
SELECT *
|
||||
FROM UserVerification;
|
||||
----------------------------------------------------------------------------
|
||||
----------------------------------------------------------------------------
|
||||
-- EOF
|
||||
@@ -4,7 +4,9 @@ using System.Text;
|
||||
using Konscious.Security.Cryptography;
|
||||
using Microsoft.Data.SqlClient;
|
||||
|
||||
string ConnectionString = Environment.GetEnvironmentVariable("SEEDDB_CONNECTION_STRING")!;
|
||||
string ConnectionString = Environment.GetEnvironmentVariable(
|
||||
"DB_CONNECTION_STRING"
|
||||
)!;
|
||||
|
||||
static async Task BuildSchema(SqlConnection connection)
|
||||
{
|
||||
@@ -13,13 +15,61 @@ static async Task BuildSchema(SqlConnection connection)
|
||||
Console.WriteLine("Database schema created or updated successfully.");
|
||||
}
|
||||
|
||||
static async Task AddStoredProcs(SqlConnection connection)
|
||||
static async Task AddStoredProcsAndFunctions(SqlConnection connection)
|
||||
{
|
||||
string sql = await File.ReadAllTextAsync(
|
||||
GetScriptPath("SeedStoredProcs.sql")
|
||||
// New approach: load functions first, then procedures, from dedicated folders.
|
||||
// Fallback to legacy combined file if folders are missing.
|
||||
string projectRoot = Path.GetFullPath(
|
||||
Path.Combine(AppContext.BaseDirectory, "..", "..", "..")
|
||||
);
|
||||
|
||||
string functionsDir = Path.Combine(projectRoot, "seed", "functions");
|
||||
string proceduresDir = Path.Combine(projectRoot, "seed", "procedures");
|
||||
|
||||
if (Directory.Exists(functionsDir))
|
||||
{
|
||||
foreach (
|
||||
string file in Directory
|
||||
.EnumerateFiles(
|
||||
functionsDir,
|
||||
"*.sql",
|
||||
SearchOption.TopDirectoryOnly
|
||||
)
|
||||
.OrderBy(f => f, StringComparer.OrdinalIgnoreCase)
|
||||
)
|
||||
{
|
||||
string sql = await File.ReadAllTextAsync(file);
|
||||
await ExecuteScriptAsync(connection, sql);
|
||||
Console.WriteLine("Stored procedures added or updated successfully.");
|
||||
Console.WriteLine(
|
||||
$"Executed function script: {Path.GetFileName(file)}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (Directory.Exists(proceduresDir))
|
||||
{
|
||||
foreach (
|
||||
string file in Directory
|
||||
.EnumerateFiles(
|
||||
proceduresDir,
|
||||
"*.sql",
|
||||
SearchOption.TopDirectoryOnly
|
||||
)
|
||||
.OrderBy(f => f, StringComparer.OrdinalIgnoreCase)
|
||||
)
|
||||
{
|
||||
string sql = await File.ReadAllTextAsync(file);
|
||||
await ExecuteScriptAsync(connection, sql);
|
||||
Console.WriteLine(
|
||||
$"Executed procedure script: {Path.GetFileName(file)}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Console.WriteLine(
|
||||
"Functions and stored procedures added or updated successfully."
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
static async Task RunSeedAsync(SqlConnection connection)
|
||||
@@ -202,7 +252,7 @@ try
|
||||
Console.WriteLine("Connection to database established successfully.");
|
||||
|
||||
await BuildSchema(connection);
|
||||
await AddStoredProcs(connection);
|
||||
await AddStoredProcsAndFunctions(connection);
|
||||
await RunSeedAsync(connection);
|
||||
Console.WriteLine("Seeding complete.");
|
||||
}
|
||||
19
DataLayer/seed/functions/UDF_GetCountryIdByCode.sql
Normal file
19
DataLayer/seed/functions/UDF_GetCountryIdByCode.sql
Normal file
@@ -0,0 +1,19 @@
|
||||
USE Biergarten;
|
||||
GO
|
||||
|
||||
CREATE OR ALTER FUNCTION dbo.UDF_GetCountryIdByCode
|
||||
(
|
||||
@CountryCode NVARCHAR(2)
|
||||
)
|
||||
RETURNS UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
DECLARE @CountryId UNIQUEIDENTIFIER;
|
||||
|
||||
SELECT @CountryId = CountryID
|
||||
FROM dbo.Country
|
||||
WHERE ISO3616_1 = @CountryCode;
|
||||
|
||||
RETURN @CountryId;
|
||||
END;
|
||||
GO
|
||||
17
DataLayer/seed/functions/UDF_GetStateProvinceIdByCode.sql
Normal file
17
DataLayer/seed/functions/UDF_GetStateProvinceIdByCode.sql
Normal file
@@ -0,0 +1,17 @@
|
||||
USE Biergarten;
|
||||
GO
|
||||
|
||||
CREATE OR ALTER FUNCTION dbo.UDF_GetStateProvinceIdByCode
|
||||
(
|
||||
@StateProvinceCode NVARCHAR(6)
|
||||
)
|
||||
RETURNS UNIQUEIDENTIFIER
|
||||
AS
|
||||
BEGIN
|
||||
DECLARE @StateProvinceId UNIQUEIDENTIFIER;
|
||||
SELECT @StateProvinceId = StateProvinceID
|
||||
FROM dbo.StateProvince
|
||||
WHERE ISO3616_2 = @StateProvinceCode;
|
||||
RETURN @StateProvinceId;
|
||||
END;
|
||||
GO
|
||||
504
DataLayer/seed/procedures/USP_AddLocations.sql
Normal file
504
DataLayer/seed/procedures/USP_AddLocations.sql
Normal file
@@ -0,0 +1,504 @@
|
||||
USE Biergarten;
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE dbo.USP_AddLocations
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
SET XACT_ABORT ON;
|
||||
|
||||
BEGIN TRANSACTION;
|
||||
-- Countries (alpha-2)
|
||||
WITH
|
||||
Countries(CountryName, Alpha2)
|
||||
AS
|
||||
(
|
||||
SELECT 'Canada', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Mexico', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'United States', 'US'
|
||||
)
|
||||
INSERT INTO dbo.Country
|
||||
(CountryName, ISO3616_1)
|
||||
SELECT c.CountryName, c.Alpha2
|
||||
FROM Countries AS c
|
||||
WHERE NOT EXISTS (SELECT 1
|
||||
FROM dbo.Country AS x
|
||||
WHERE x.ISO3616_1 = c.Alpha2
|
||||
);
|
||||
|
||||
WITH
|
||||
Regions(StateProvinceName, ISO2, CountryAlpha2)
|
||||
AS
|
||||
(
|
||||
-- United States (50 + DC + territories)
|
||||
SELECT 'Alabama', 'US-AL', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Alaska', 'US-AK', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Arizona', 'US-AZ', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Arkansas', 'US-AR', 'US'
|
||||
UNION ALL
|
||||
SELECT 'California', 'US-CA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Colorado', 'US-CO', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Connecticut', 'US-CT', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Delaware', 'US-DE', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Florida', 'US-FL', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Georgia', 'US-GA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Hawaii', 'US-HI', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Idaho', 'US-ID', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Illinois', 'US-IL', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Indiana', 'US-IN', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Iowa', 'US-IA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Kansas', 'US-KS', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Kentucky', 'US-KY', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Louisiana', 'US-LA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Maine', 'US-ME', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Maryland', 'US-MD', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Massachusetts', 'US-MA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Michigan', 'US-MI', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Minnesota', 'US-MN', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Mississippi', 'US-MS', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Missouri', 'US-MO', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Montana', 'US-MT', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Nebraska', 'US-NE', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Nevada', 'US-NV', 'US'
|
||||
UNION ALL
|
||||
SELECT 'New Hampshire', 'US-NH', 'US'
|
||||
UNION ALL
|
||||
SELECT 'New Jersey', 'US-NJ', 'US'
|
||||
UNION ALL
|
||||
SELECT 'New Mexico', 'US-NM', 'US'
|
||||
UNION ALL
|
||||
SELECT 'New York', 'US-NY', 'US'
|
||||
UNION ALL
|
||||
SELECT 'North Carolina', 'US-NC', 'US'
|
||||
UNION ALL
|
||||
SELECT 'North Dakota', 'US-ND', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Ohio', 'US-OH', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Oklahoma', 'US-OK', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Oregon', 'US-OR', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Pennsylvania', 'US-PA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Rhode Island', 'US-RI', 'US'
|
||||
UNION ALL
|
||||
SELECT 'South Carolina', 'US-SC', 'US'
|
||||
UNION ALL
|
||||
SELECT 'South Dakota', 'US-SD', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Tennessee', 'US-TN', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Texas', 'US-TX', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Utah', 'US-UT', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Vermont', 'US-VT', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Virginia', 'US-VA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Washington', 'US-WA', 'US'
|
||||
UNION ALL
|
||||
SELECT 'West Virginia', 'US-WV', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Wisconsin', 'US-WI', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Wyoming', 'US-WY', 'US'
|
||||
UNION ALL
|
||||
SELECT 'District of Columbia', 'US-DC', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Puerto Rico', 'US-PR', 'US'
|
||||
UNION ALL
|
||||
SELECT 'U.S. Virgin Islands', 'US-VI', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Guam', 'US-GU', 'US'
|
||||
UNION ALL
|
||||
SELECT 'Northern Mariana Islands', 'US-MP', 'US'
|
||||
UNION ALL
|
||||
SELECT 'American Samoa', 'US-AS', 'US'
|
||||
|
||||
-- Canada (10 provinces + 3 territories)
|
||||
UNION ALL
|
||||
SELECT 'Ontario', 'CA-ON', 'CA'
|
||||
UNION ALL
|
||||
SELECT N'Québec', 'CA-QC', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Nova Scotia', 'CA-NS', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'New Brunswick', 'CA-NB', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Manitoba', 'CA-MB', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'British Columbia', 'CA-BC', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Prince Edward Island', 'CA-PE', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Saskatchewan', 'CA-SK', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Alberta', 'CA-AB', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Newfoundland and Labrador', 'CA-NL', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Northwest Territories', 'CA-NT', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Yukon', 'CA-YT', 'CA'
|
||||
UNION ALL
|
||||
SELECT 'Nunavut', 'CA-NU', 'CA'
|
||||
|
||||
-- Mexico (32 states incl. CDMX)
|
||||
UNION ALL
|
||||
SELECT 'Aguascalientes', 'MX-AGU', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Baja California', 'MX-BCN', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Baja California Sur', 'MX-BCS', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Campeche', 'MX-CAM', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Chiapas', 'MX-CHP', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Chihuahua', 'MX-CHH', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Coahuila de Zaragoza', 'MX-COA', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Colima', 'MX-COL', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Durango', 'MX-DUR', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Guanajuato', 'MX-GUA', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Guerrero', 'MX-GRO', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Hidalgo', 'MX-HID', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Jalisco', 'MX-JAL', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'México State', 'MX-MEX', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'Michoacán de Ocampo', 'MX-MIC', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Morelos', 'MX-MOR', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Nayarit', 'MX-NAY', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'Nuevo León', 'MX-NLE', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Oaxaca', 'MX-OAX', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Puebla', 'MX-PUE', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'Querétaro', 'MX-QUE', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Quintana Roo', 'MX-ROO', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'San Luis Potosí', 'MX-SLP', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Sinaloa', 'MX-SIN', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Sonora', 'MX-SON', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Tabasco', 'MX-TAB', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Tamaulipas', 'MX-TAM', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Tlaxcala', 'MX-TLA', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Veracruz de Ignacio de la Llave', 'MX-VER', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'Yucatán', 'MX-YUC', 'MX'
|
||||
UNION ALL
|
||||
SELECT 'Zacatecas', 'MX-ZAC', 'MX'
|
||||
UNION ALL
|
||||
SELECT N'Ciudad de México', 'MX-CMX', 'MX'
|
||||
)
|
||||
INSERT INTO dbo.StateProvince
|
||||
(StateProvinceName, ISO3616_2, CountryID)
|
||||
SELECT
|
||||
r.StateProvinceName,
|
||||
r.ISO2,
|
||||
dbo.UDF_GetCountryIdByCode(r.CountryAlpha2)
|
||||
FROM Regions AS r
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM dbo.StateProvince AS sp
|
||||
WHERE sp.ISO3616_2 = r.ISO2
|
||||
);
|
||||
|
||||
WITH
|
||||
Cities(StateProvinceISO2, CityName)
|
||||
AS
|
||||
(
|
||||
-- USA
|
||||
SELECT 'US-CA', 'Los Angeles'
|
||||
UNION ALL
|
||||
SELECT 'US-CA', 'San Diego'
|
||||
UNION ALL
|
||||
SELECT 'US-CA', 'San Francisco'
|
||||
UNION ALL
|
||||
SELECT 'US-CA', 'Sacramento'
|
||||
UNION ALL
|
||||
SELECT 'US-TX', 'Houston'
|
||||
UNION ALL
|
||||
SELECT 'US-TX', 'Dallas'
|
||||
UNION ALL
|
||||
SELECT 'US-TX', 'Austin'
|
||||
UNION ALL
|
||||
SELECT 'US-TX', 'San Antonio'
|
||||
UNION ALL
|
||||
SELECT 'US-FL', 'Miami'
|
||||
UNION ALL
|
||||
SELECT 'US-FL', 'Orlando'
|
||||
UNION ALL
|
||||
SELECT 'US-FL', 'Tampa'
|
||||
UNION ALL
|
||||
SELECT 'US-NY', 'New York'
|
||||
UNION ALL
|
||||
SELECT 'US-NY', 'Buffalo'
|
||||
UNION ALL
|
||||
SELECT 'US-NY', 'Rochester'
|
||||
UNION ALL
|
||||
SELECT 'US-IL', 'Chicago'
|
||||
UNION ALL
|
||||
SELECT 'US-IL', 'Springfield'
|
||||
UNION ALL
|
||||
SELECT 'US-PA', 'Philadelphia'
|
||||
UNION ALL
|
||||
SELECT 'US-PA', 'Pittsburgh'
|
||||
UNION ALL
|
||||
SELECT 'US-AZ', 'Phoenix'
|
||||
UNION ALL
|
||||
SELECT 'US-AZ', 'Tucson'
|
||||
UNION ALL
|
||||
SELECT 'US-CO', 'Denver'
|
||||
UNION ALL
|
||||
SELECT 'US-CO', 'Colorado Springs'
|
||||
UNION ALL
|
||||
SELECT 'US-MA', 'Boston'
|
||||
UNION ALL
|
||||
SELECT 'US-MA', 'Worcester'
|
||||
UNION ALL
|
||||
SELECT 'US-WA', 'Seattle'
|
||||
UNION ALL
|
||||
SELECT 'US-WA', 'Spokane'
|
||||
UNION ALL
|
||||
SELECT 'US-GA', 'Atlanta'
|
||||
UNION ALL
|
||||
SELECT 'US-GA', 'Savannah'
|
||||
UNION ALL
|
||||
SELECT 'US-NV', 'Las Vegas'
|
||||
UNION ALL
|
||||
SELECT 'US-NV', 'Reno'
|
||||
UNION ALL
|
||||
SELECT 'US-MI', 'Detroit'
|
||||
UNION ALL
|
||||
SELECT 'US-MI', 'Grand Rapids'
|
||||
UNION ALL
|
||||
SELECT 'US-MN', 'Minneapolis'
|
||||
UNION ALL
|
||||
SELECT 'US-MN', 'Saint Paul'
|
||||
UNION ALL
|
||||
SELECT 'US-OH', 'Columbus'
|
||||
UNION ALL
|
||||
SELECT 'US-OH', 'Cleveland'
|
||||
UNION ALL
|
||||
SELECT 'US-OR', 'Portland'
|
||||
UNION ALL
|
||||
SELECT 'US-OR', 'Salem'
|
||||
UNION ALL
|
||||
SELECT 'US-TN', 'Nashville'
|
||||
UNION ALL
|
||||
SELECT 'US-TN', 'Memphis'
|
||||
UNION ALL
|
||||
SELECT 'US-VA', 'Richmond'
|
||||
UNION ALL
|
||||
SELECT 'US-VA', 'Virginia Beach'
|
||||
UNION ALL
|
||||
SELECT 'US-MD', 'Baltimore'
|
||||
UNION ALL
|
||||
SELECT 'US-MD', 'Frederick'
|
||||
UNION ALL
|
||||
SELECT 'US-DC', 'Washington'
|
||||
UNION ALL
|
||||
SELECT 'US-UT', 'Salt Lake City'
|
||||
UNION ALL
|
||||
SELECT 'US-UT', 'Provo'
|
||||
UNION ALL
|
||||
SELECT 'US-LA', 'New Orleans'
|
||||
UNION ALL
|
||||
SELECT 'US-LA', 'Baton Rouge'
|
||||
UNION ALL
|
||||
SELECT 'US-KY', 'Louisville'
|
||||
UNION ALL
|
||||
SELECT 'US-KY', 'Lexington'
|
||||
UNION ALL
|
||||
SELECT 'US-IA', 'Des Moines'
|
||||
UNION ALL
|
||||
SELECT 'US-IA', 'Cedar Rapids'
|
||||
UNION ALL
|
||||
SELECT 'US-OK', 'Oklahoma City'
|
||||
UNION ALL
|
||||
SELECT 'US-OK', 'Tulsa'
|
||||
UNION ALL
|
||||
SELECT 'US-NE', 'Omaha'
|
||||
UNION ALL
|
||||
SELECT 'US-NE', 'Lincoln'
|
||||
UNION ALL
|
||||
SELECT 'US-MO', 'Kansas City'
|
||||
UNION ALL
|
||||
SELECT 'US-MO', 'St. Louis'
|
||||
UNION ALL
|
||||
SELECT 'US-NC', 'Charlotte'
|
||||
UNION ALL
|
||||
SELECT 'US-NC', 'Raleigh'
|
||||
UNION ALL
|
||||
SELECT 'US-SC', 'Columbia'
|
||||
UNION ALL
|
||||
SELECT 'US-SC', 'Charleston'
|
||||
UNION ALL
|
||||
SELECT 'US-WI', 'Milwaukee'
|
||||
UNION ALL
|
||||
SELECT 'US-WI', 'Madison'
|
||||
UNION ALL
|
||||
SELECT 'US-MN', 'Duluth'
|
||||
UNION ALL
|
||||
SELECT 'US-AK', 'Anchorage'
|
||||
UNION ALL
|
||||
SELECT 'US-HI', 'Honolulu'
|
||||
-- Canada
|
||||
UNION ALL
|
||||
SELECT 'CA-ON', 'Toronto'
|
||||
UNION ALL
|
||||
SELECT 'CA-ON', 'Ottawa'
|
||||
UNION ALL
|
||||
SELECT 'CA-QC', N'Montréal'
|
||||
UNION ALL
|
||||
SELECT 'CA-QC', N'Québec City'
|
||||
UNION ALL
|
||||
SELECT 'CA-BC', 'Vancouver'
|
||||
UNION ALL
|
||||
SELECT 'CA-BC', 'Victoria'
|
||||
UNION ALL
|
||||
SELECT 'CA-AB', 'Calgary'
|
||||
UNION ALL
|
||||
SELECT 'CA-AB', 'Edmonton'
|
||||
UNION ALL
|
||||
SELECT 'CA-MB', 'Winnipeg'
|
||||
UNION ALL
|
||||
SELECT 'CA-NS', 'Halifax'
|
||||
UNION ALL
|
||||
SELECT 'CA-SK', 'Saskatoon'
|
||||
UNION ALL
|
||||
SELECT 'CA-SK', 'Regina'
|
||||
UNION ALL
|
||||
SELECT 'CA-NB', 'Moncton'
|
||||
UNION ALL
|
||||
SELECT 'CA-NB', 'Saint John'
|
||||
UNION ALL
|
||||
SELECT 'CA-PE', 'Charlottetown'
|
||||
UNION ALL
|
||||
SELECT 'CA-NL', N'St. John''s'
|
||||
UNION ALL
|
||||
SELECT 'CA-ON', 'Hamilton'
|
||||
UNION ALL
|
||||
SELECT 'CA-ON', 'London'
|
||||
UNION ALL
|
||||
SELECT 'CA-QC', 'Gatineau'
|
||||
UNION ALL
|
||||
SELECT 'CA-QC', 'Laval'
|
||||
UNION ALL
|
||||
SELECT 'CA-BC', 'Kelowna'
|
||||
UNION ALL
|
||||
SELECT 'CA-AB', 'Red Deer'
|
||||
UNION ALL
|
||||
SELECT 'CA-MB', 'Brandon'
|
||||
-- MEXICO
|
||||
UNION ALL
|
||||
SELECT 'MX-CMX', N'Ciudad de México'
|
||||
UNION ALL
|
||||
SELECT 'MX-JAL', 'Guadalajara'
|
||||
UNION ALL
|
||||
SELECT 'MX-NLE', 'Monterrey'
|
||||
UNION ALL
|
||||
SELECT 'MX-PUE', 'Puebla'
|
||||
UNION ALL
|
||||
SELECT 'MX-ROO', N'Cancún'
|
||||
UNION ALL
|
||||
SELECT 'MX-GUA', 'Guanajuato'
|
||||
UNION ALL
|
||||
SELECT 'MX-MIC', 'Morelia'
|
||||
UNION ALL
|
||||
SELECT 'MX-BCN', 'Tijuana'
|
||||
UNION ALL
|
||||
SELECT 'MX-JAL', 'Zapopan'
|
||||
UNION ALL
|
||||
SELECT 'MX-NLE', N'San Nicolás'
|
||||
UNION ALL
|
||||
SELECT 'MX-CAM', 'Campeche'
|
||||
UNION ALL
|
||||
SELECT 'MX-TAB', 'Villahermosa'
|
||||
UNION ALL
|
||||
SELECT 'MX-VER', 'Veracruz'
|
||||
UNION ALL
|
||||
SELECT 'MX-OAX', 'Oaxaca'
|
||||
UNION ALL
|
||||
SELECT 'MX-SLP', N'San Luis Potosí'
|
||||
UNION ALL
|
||||
SELECT 'MX-CHH', 'Chihuahua'
|
||||
UNION ALL
|
||||
SELECT 'MX-AGU', 'Aguascalientes'
|
||||
UNION ALL
|
||||
SELECT 'MX-MEX', 'Toluca'
|
||||
UNION ALL
|
||||
SELECT 'MX-COA', 'Saltillo'
|
||||
UNION ALL
|
||||
SELECT 'MX-BCS', 'La Paz'
|
||||
UNION ALL
|
||||
SELECT 'MX-NAY', 'Tepic'
|
||||
UNION ALL
|
||||
SELECT 'MX-ZAC', 'Zacatecas'
|
||||
)
|
||||
INSERT INTO dbo.City
|
||||
(StateProvinceID, CityName)
|
||||
SELECT
|
||||
dbo.UDF_GetStateProvinceIdByCode(c.StateProvinceISO2),
|
||||
c.CityName
|
||||
FROM Cities AS c
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM dbo.City AS ci
|
||||
WHERE ci.CityName = c.CityName
|
||||
AND ci.StateProvinceID = dbo.UDF_GetStateProvinceIdByCode(c.StateProvinceISO2)
|
||||
);
|
||||
|
||||
|
||||
COMMIT TRANSACTION;
|
||||
END;
|
||||
GO
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
USE biergarten;
|
||||
USE Biergarten;
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE dbo.USP_AddTestUsers
|
||||
@@ -135,65 +134,3 @@ BEGIN
|
||||
COMMIT TRANSACTION;
|
||||
END;
|
||||
GO
|
||||
|
||||
CREATE TYPE TblUserHashes AS TABLE
|
||||
(
|
||||
UserAccountId UNIQUEIDENTIFIER NOT NULL,
|
||||
Hash NVARCHAR(MAX) NOT NULL
|
||||
);
|
||||
GO
|
||||
|
||||
-- Stored procedure to insert Argon2 hashes
|
||||
CREATE OR ALTER PROCEDURE dbo.USP_AddUserCredentials
|
||||
(
|
||||
@Hash dbo.TblUserHashes READONLY
|
||||
)
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
SET XACT_ABORT ON;
|
||||
|
||||
BEGIN TRANSACTION;
|
||||
|
||||
INSERT INTO dbo.UserCredential
|
||||
(UserAccountId, Hash)
|
||||
SELECT
|
||||
uah.UserAccountId,
|
||||
uah.Hash
|
||||
FROM @Hash AS uah;
|
||||
|
||||
COMMIT TRANSACTION;
|
||||
END;
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE dbo.USP_CreateUserVerification
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
SET XACT_ABORT ON;
|
||||
|
||||
BEGIN TRANSACTION;
|
||||
|
||||
INSERT INTO dbo.UserVerification
|
||||
(UserAccountId)
|
||||
SELECT
|
||||
ua.UserAccountID
|
||||
FROM dbo.UserAccount AS ua
|
||||
WHERE NOT EXISTS
|
||||
(SELECT 1
|
||||
FROM dbo.UserVerification AS uv
|
||||
WHERE uv.UserAccountId = ua.UserAccountID);
|
||||
|
||||
|
||||
IF (SELECT COUNT(*)
|
||||
FROM dbo.UserVerification) != (SELECT COUNT(*)
|
||||
FROM dbo.UserAccount)
|
||||
BEGIN
|
||||
RAISERROR('UserVerification count does not match UserAccount count after insertion.', 16, 1);
|
||||
ROLLBACK TRANSACTION;
|
||||
RETURN;
|
||||
END
|
||||
|
||||
COMMIT TRANSACTION;
|
||||
END
|
||||
GO
|
||||
33
DataLayer/seed/procedures/USP_AddUserCredentials.sql
Normal file
33
DataLayer/seed/procedures/USP_AddUserCredentials.sql
Normal file
@@ -0,0 +1,33 @@
|
||||
USE Biergarten;
|
||||
GO
|
||||
|
||||
IF TYPE_ID(N'dbo.TblUserHashes') IS NULL
|
||||
EXEC('CREATE TYPE dbo.TblUserHashes AS TABLE
|
||||
(
|
||||
UserAccountId UNIQUEIDENTIFIER NOT NULL,
|
||||
Hash NVARCHAR(MAX) NOT NULL
|
||||
);');
|
||||
GO
|
||||
|
||||
-- Stored procedure to insert Argon2 hashes
|
||||
CREATE OR ALTER PROCEDURE dbo.USP_AddUserCredentials
|
||||
(
|
||||
@Hash dbo.TblUserHashes READONLY
|
||||
)
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
SET XACT_ABORT ON;
|
||||
|
||||
BEGIN TRANSACTION;
|
||||
|
||||
INSERT INTO dbo.UserCredential
|
||||
(UserAccountId, Hash)
|
||||
SELECT
|
||||
uah.UserAccountId,
|
||||
uah.Hash
|
||||
FROM @Hash AS uah;
|
||||
|
||||
COMMIT TRANSACTION;
|
||||
END;
|
||||
GO
|
||||
35
DataLayer/seed/procedures/USP_CreateUserVerification.sql
Normal file
35
DataLayer/seed/procedures/USP_CreateUserVerification.sql
Normal file
@@ -0,0 +1,35 @@
|
||||
USE Biergarten;
|
||||
GO
|
||||
|
||||
CREATE OR ALTER PROCEDURE dbo.USP_CreateUserVerification
|
||||
AS
|
||||
BEGIN
|
||||
SET NOCOUNT ON;
|
||||
SET XACT_ABORT ON;
|
||||
|
||||
BEGIN TRANSACTION;
|
||||
|
||||
INSERT INTO dbo.UserVerification
|
||||
(UserAccountId)
|
||||
SELECT
|
||||
ua.UserAccountID
|
||||
FROM dbo.UserAccount AS ua
|
||||
WHERE NOT EXISTS
|
||||
(SELECT 1
|
||||
FROM dbo.UserVerification AS uv
|
||||
WHERE uv.UserAccountId = ua.UserAccountID);
|
||||
|
||||
|
||||
IF (SELECT COUNT(*)
|
||||
FROM dbo.UserVerification)
|
||||
!= (SELECT COUNT(*)
|
||||
FROM dbo.UserAccount)
|
||||
BEGIN
|
||||
RAISERROR('UserVerification count does not match UserAccount count after insertion.', 16, 1);
|
||||
ROLLBACK TRANSACTION;
|
||||
RETURN;
|
||||
END
|
||||
|
||||
COMMIT TRANSACTION;
|
||||
END
|
||||
GO
|
||||
@@ -16,21 +16,33 @@ app.UseHttpsRedirection();
|
||||
|
||||
var summaries = new[]
|
||||
{
|
||||
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
|
||||
"Freezing",
|
||||
"Bracing",
|
||||
"Chilly",
|
||||
"Cool",
|
||||
"Mild",
|
||||
"Warm",
|
||||
"Balmy",
|
||||
"Hot",
|
||||
"Sweltering",
|
||||
"Scorching",
|
||||
};
|
||||
|
||||
app.MapGet("/weatherforecast", () =>
|
||||
app.MapGet(
|
||||
"/weatherforecast",
|
||||
() =>
|
||||
{
|
||||
var forecast = Enumerable.Range(1, 5).Select(index =>
|
||||
new WeatherForecast
|
||||
(
|
||||
var forecast = Enumerable
|
||||
.Range(1, 5)
|
||||
.Select(index => new WeatherForecast(
|
||||
DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
|
||||
Random.Shared.Next(-20, 55),
|
||||
summaries[Random.Shared.Next(summaries.Length)]
|
||||
))
|
||||
.ToArray();
|
||||
return forecast;
|
||||
})
|
||||
}
|
||||
)
|
||||
.WithName("GetWeatherForecast");
|
||||
|
||||
app.UseStaticFiles();
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
@@ -9,5 +8,4 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -24,7 +24,7 @@ services:
|
||||
tty: true
|
||||
stdin_open: true
|
||||
volumes:
|
||||
- ./:/home/dev/projects # bind mount your repo for live code edits
|
||||
- ./:/home/dev/projects
|
||||
- nuget-cache:/home/dev/.nuget/packages
|
||||
- ~/.gitconfig:/home/dev/.gitconfig:ro
|
||||
working_dir: /home/dev/projects
|
||||
@@ -32,7 +32,7 @@ services:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: "1"
|
||||
HOME: /home/dev
|
||||
USER: dev
|
||||
SEEDDB_CONNECTION_STRING: "Server=sqlserver,1433;User Id=sa;Password=YourStrong!Passw0rd;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;"
|
||||
DB_CONNECTION_STRING: "Server=sqlserver,1433;User Id=sa;Password=YourStrong!Passw0rd;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;"
|
||||
user: root
|
||||
networks:
|
||||
- devnet
|
||||
|
||||
Reference in New Issue
Block a user