13 Commits

Author SHA1 Message Date
mrcwlnd 711ea2a00b Merge pull request 'dockercompose angepasst' (#16) from testbranch into main
Reviewed-on: #16
2026-06-25 19:12:44 +00:00
mrcwlnd c27b1088ee Merge pull request 'sql updates' (#15) from testbranch into main
Reviewed-on: #15
2026-06-25 19:08:29 +00:00
mrcwlnd 807d56d071 Merge pull request 'asynchroner tenant' (#14) from testbranch into main
Reviewed-on: #14
2026-06-25 19:04:19 +00:00
mrcwlnd c77cd7d524 Merge pull request 'fixed' (#13) from testbranch into main
Reviewed-on: #13
2026-06-25 18:59:26 +00:00
mrcwlnd 17c8e5e9ed Merge pull request 'feat: ignore pending model changes warnings and update EF Core version in DbContext configuration' (#12) from testbranch into main
Reviewed-on: #12
2026-06-25 18:49:21 +00:00
mrcwlnd 9bcce06842 Merge pull request 'fixed database' (#11) from testbranch into main
Reviewed-on: #11
2026-06-25 18:41:18 +00:00
mrcwlnd 528eeb13a1 Merge pull request 'Multi tenant integration' (#10) from multi-tenant-integration into main
Reviewed-on: #10
2026-06-25 18:34:05 +00:00
mrcwlnd d5f68ca520 Merge branch 'main' into multi-tenant-integration 2026-06-25 18:34:01 +00:00
mrcwlnd 8a0bf59994 Merge pull request 'feat: add vacation day management to home view and persist changelog version in local storage' (#9) from multi-tenant-integration into main
Reviewed-on: #9
2026-06-24 20:39:48 +00:00
mrcwlnd 147b589d59 Merge pull request 'little bugfix' (#8) from multi-tenant-integration into main
Reviewed-on: #8
2026-06-24 20:33:35 +00:00
mrcwlnd a379088a24 Merge pull request 'Huge updates' (#7) from navbar_styling into main
Reviewed-on: #7
2026-06-24 20:29:47 +00:00
mrcwlnd 9824616323 Merge pull request 'Neue agb seite implementiert' (#6) from navbar_styling into main
Reviewed-on: #6
2026-06-08 22:24:11 +00:00
mrcwlnd 8bd7423209 Merge pull request 'Neue navbar' (#5) from navbar_styling into main
Reviewed-on: #5
2026-06-08 22:06:32 +00:00
2 changed files with 2 additions and 46 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ services:
- EnableHttpsRedirect=false
- TenantSettings__BaseDomain=timetracker.marc-wieland.de
volumes:
- dpkeys:/home/app/.aspnet/DataProtection-Keys
- dpkeys:/root/.aspnet/DataProtection-Keys
depends_on:
- db
+1 -45
View File
@@ -227,54 +227,10 @@ using (var scope = app.Services.CreateScope())
}
}
}
// Check if column IsApproved in Tenants table is of type integer
using (var cmdCheckApproved = conn.CreateCommand())
{
cmdCheckApproved.CommandText = @"
SELECT data_type
FROM information_schema.columns
WHERE table_name = 'Tenants' AND column_name = 'IsApproved';";
var dataType = await cmdCheckApproved.ExecuteScalarAsync() as string;
if (dataType != null && dataType.Equals("integer", StringComparison.OrdinalIgnoreCase))
{
// Alter the column type to boolean
using (var cmdAlterApproved = conn.CreateCommand())
{
cmdAlterApproved.CommandText = @"
ALTER TABLE ""Tenants""
ALTER COLUMN ""IsApproved"" TYPE boolean
USING (""IsApproved"" <> 0);";
await cmdAlterApproved.ExecuteNonQueryAsync();
}
}
}
// Check if column CreatedAt in Tenants table is of type text or character varying
using (var cmdCheckCreatedAt = conn.CreateCommand())
{
cmdCheckCreatedAt.CommandText = @"
SELECT data_type
FROM information_schema.columns
WHERE table_name = 'Tenants' AND column_name = 'CreatedAt';";
var dataType = await cmdCheckCreatedAt.ExecuteScalarAsync() as string;
if (dataType != null && (dataType.Equals("text", StringComparison.OrdinalIgnoreCase) || dataType.Equals("character varying", StringComparison.OrdinalIgnoreCase)))
{
// Alter the column type to timestamp without time zone
using (var cmdAlterCreatedAt = conn.CreateCommand())
{
cmdAlterCreatedAt.CommandText = @"
ALTER TABLE ""Tenants""
ALTER COLUMN ""CreatedAt"" TYPE timestamp without time zone
USING (""CreatedAt""::timestamp without time zone);";
await cmdAlterCreatedAt.ExecuteNonQueryAsync();
}
}
}
}
catch (Exception ex)
{
Console.WriteLine($"Fehler beim Konvertieren der PostgreSQL-Spaltentypen (IsTenantAdmin/IsApproved/CreatedAt): {ex.Message}");
Console.WriteLine($"Fehler beim Konvertieren der IsTenantAdmin-Spalte in PostgreSQL: {ex.Message}");
}
}
}