Skip to content

Commit 06d2774

Browse files
standerenstanderen
authored
Merge branch 'main' into clean-up-studio-toggleable-textfield
2 parents 58beda3 + febeb3a commit 06d2774

File tree

86 files changed

+2557
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2557
-708
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ The development environment consist of several services defined in [compose.yaml
6161
- `studio-repos` which is [gitea][14] with some custom config. More [here](gitea/README.md).
6262
- `studio-db` which is a postgres database used by both `studio-designer` and `studio-repos`.
6363
- `database_migrations` which is a one-time task container designed to perform and complete database migrations before exiting.
64+
- `pgadmin` which is a administration and development platform for PostgreSQL.
6465
- `redis` which is a redis cache used by designer.
6566
- `redis-commander` which is a ui for redis cache.
6667

‎backend/Migrations.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV OidcLoginSettings__FetchClientIdAndSecretFromRootEnvFile=false
1111
ENV OidcLoginSettings__ClientId=dummyRequired
1212
ENV OidcLoginSettings__ClientSecret=dummyRequired
1313

14-
RUN dotnet ef migrations script --project src/Designer/Designer.csproj -o /app/migrations.sql
14+
RUN dotnet ef migrations script --project src/Designer/Designer.csproj --idempotent -o /app/migrations.sql
1515

1616
FROM alpine:3.21.0 AS final
1717
COPY --from=build /app/migrations.sql migrations.sql

‎backend/src/Designer/Infrastructure/ServiceRegistration.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public static IServiceCollection RegisterServiceImplementations(this IServiceCol
5151
options.UseNpgsql(postgresSettings.FormattedConnectionString());
5252
});
5353

54-
services.AddScoped<IReleaseRepository, ORMReleaseRepository>();
55-
services.AddScoped<IDeploymentRepository, ORMDeploymentRepository>();
54+
services.AddScoped<IReleaseRepository, ReleaseRepository>();
55+
services.AddScoped<IDeploymentRepository, DeploymentRepository>();
5656
services.AddScoped<IAppScopesRepository, AppScopesRepository>();
5757
services.AddTransient<IReleaseService, ReleaseService>();
5858
services.AddTransient<IDeploymentService, DeploymentService>();

‎backend/src/Designer/Migrations/20250107121305_AddBuidsTableAndDeploymentsColumns.Designer.cs

+242
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/src/Designer/Migrations/20250107121305_AddBuidsTableAndDeploymentsColumns.cs

+117
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
using System;
2+
using Microsoft.EntityFrameworkCore.Migrations;
3+
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
4+
5+
#nullable disable
6+
7+
namespace Altinn.Studio.Designer.Migrations
8+
{
9+
/// <inheritdoc />
10+
public partial class AddBuidsTableAndDeploymentsColumns : Migration
11+
{
12+
/// <inheritdoc />
13+
protected override void Up(MigrationBuilder migrationBuilder)
14+
{
15+
migrationBuilder.AddColumn<string>(
16+
name: "created_by",
17+
schema: "designer",
18+
table: "deployments",
19+
type: "character varying",
20+
nullable: true);
21+
22+
migrationBuilder.AddColumn<string>(
23+
name: "envname",
24+
schema: "designer",
25+
table: "deployments",
26+
type: "character varying",
27+
nullable: true);
28+
29+
migrationBuilder.AddColumn<long>(
30+
name: "internal_build_id",
31+
schema: "designer",
32+
table: "deployments",
33+
type: "bigint",
34+
nullable: true);
35+
36+
migrationBuilder.CreateTable(
37+
name: "builds",
38+
schema: "designer",
39+
columns: table => new
40+
{
41+
id = table.Column<long>(type: "bigint", nullable: false)
42+
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
43+
external_id = table.Column<string>(type: "character varying", nullable: true),
44+
status = table.Column<string>(type: "character varying", nullable: true),
45+
result = table.Column<string>(type: "character varying", nullable: true),
46+
build_type = table.Column<int>(type: "integer", nullable: false),
47+
started = table.Column<DateTimeOffset>(type: "timestamptz", nullable: true),
48+
finished = table.Column<DateTimeOffset>(type: "timestamptz", nullable: true)
49+
},
50+
constraints: table =>
51+
{
52+
table.PrimaryKey("PK_builds", x => x.id);
53+
});
54+
55+
migrationBuilder.CreateIndex(
56+
name: "IX_deployments_internal_build_id",
57+
schema: "designer",
58+
table: "deployments",
59+
column: "internal_build_id");
60+
61+
migrationBuilder.CreateIndex(
62+
name: "IX_builds_build_type",
63+
schema: "designer",
64+
table: "builds",
65+
column: "build_type");
66+
67+
migrationBuilder.CreateIndex(
68+
name: "IX_builds_external_id_build_type",
69+
schema: "designer",
70+
table: "builds",
71+
columns: new[] { "external_id", "build_type" },
72+
unique: true);
73+
74+
migrationBuilder.AddForeignKey(
75+
name: "fk_deployments_builds_buildid",
76+
schema: "designer",
77+
table: "deployments",
78+
column: "internal_build_id",
79+
principalSchema: "designer",
80+
principalTable: "builds",
81+
principalColumn: "id");
82+
}
83+
84+
/// <inheritdoc />
85+
protected override void Down(MigrationBuilder migrationBuilder)
86+
{
87+
migrationBuilder.DropForeignKey(
88+
name: "fk_deployments_builds_buildid",
89+
schema: "designer",
90+
table: "deployments");
91+
92+
migrationBuilder.DropTable(
93+
name: "builds",
94+
schema: "designer");
95+
96+
migrationBuilder.DropIndex(
97+
name: "IX_deployments_internal_build_id",
98+
schema: "designer",
99+
table: "deployments");
100+
101+
migrationBuilder.DropColumn(
102+
name: "created_by",
103+
schema: "designer",
104+
table: "deployments");
105+
106+
migrationBuilder.DropColumn(
107+
name: "envname",
108+
schema: "designer",
109+
table: "deployments");
110+
111+
migrationBuilder.DropColumn(
112+
name: "internal_build_id",
113+
schema: "designer",
114+
table: "deployments");
115+
}
116+
}
117+
}

0 commit comments

Comments
 (0)