Skip to content

Commit 337150e

Browse files
dbeuchlerdbeuchler
authored
Merge pull request #758 from PHOENIXCONTACT/feature/module-models
Reworked data-models and applied common conventions
2 parents 4817ee5 + eeae872 commit 337150e

File tree

221 files changed

+4646
-4712
lines changed

Some content is hidden

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

221 files changed

+4646
-4712
lines changed

‎MORYX-Framework.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Products", "Products", "{CA
9494
EndProject
9595
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Products.Management", "src\Moryx.Products.Management\Moryx.Products.Management.csproj", "{F745A7BF-2207-47D5-9B14-352D9CA22A03}"
9696
EndProject
97-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Products.Model", "src\Moryx.Products.Model\Moryx.Products.Model.csproj", "{D9CF584F-7C49-439E-8A37-1EF053A17DBF}"
98-
EndProject
9997
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.AbstractionLayer.Products.Endpoints", "src\Moryx.AbstractionLayer.Products.Endpoints\Moryx.AbstractionLayer.Products.Endpoints.csproj", "{1568BF64-479D-4D11-957C-810452940952}"
10098
EndProject
10199
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moryx.Products.Samples", "src\Moryx.Products.Samples\Moryx.Products.Samples.csproj", "{C65A63EE-8B15-42B2-90B7-EF49EBDAB7BB}"
@@ -444,10 +442,6 @@ Global
444442
{F745A7BF-2207-47D5-9B14-352D9CA22A03}.Debug|Any CPU.Build.0 = Debug|Any CPU
445443
{F745A7BF-2207-47D5-9B14-352D9CA22A03}.Release|Any CPU.ActiveCfg = Release|Any CPU
446444
{F745A7BF-2207-47D5-9B14-352D9CA22A03}.Release|Any CPU.Build.0 = Release|Any CPU
447-
{D9CF584F-7C49-439E-8A37-1EF053A17DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
448-
{D9CF584F-7C49-439E-8A37-1EF053A17DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
449-
{D9CF584F-7C49-439E-8A37-1EF053A17DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
450-
{D9CF584F-7C49-439E-8A37-1EF053A17DBF}.Release|Any CPU.Build.0 = Release|Any CPU
451445
{1568BF64-479D-4D11-957C-810452940952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
452446
{1568BF64-479D-4D11-957C-810452940952}.Debug|Any CPU.Build.0 = Debug|Any CPU
453447
{1568BF64-479D-4D11-957C-810452940952}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -871,7 +865,6 @@ Global
871865
{0FB22EF0-3C6F-4235-A50E-3A976AC261D3} = {7DCDBDA5-4163-41EA-B24E-9316DFB9F354}
872866
{01F99194-DC37-4EF2-A36E-DCE3EADC4062} = {953AAE25-26C8-4A28-AB08-61BAFE41B22F}
873867
{F745A7BF-2207-47D5-9B14-352D9CA22A03} = {CA2B9835-7C05-417F-882C-72A8B857679E}
874-
{D9CF584F-7C49-439E-8A37-1EF053A17DBF} = {CA2B9835-7C05-417F-882C-72A8B857679E}
875868
{1568BF64-479D-4D11-957C-810452940952} = {CA2B9835-7C05-417F-882C-72A8B857679E}
876869
{C65A63EE-8B15-42B2-90B7-EF49EBDAB7BB} = {CA2B9835-7C05-417F-882C-72A8B857679E}
877870
{D3CB0DAE-F5E8-4523-8131-80497057F411} = {0D2B1DF8-2E8F-404D-B146-B8B567D8ACAE}

‎src/Moryx.ControlSystem.ProcessEngine/Model/Migrations/Npgsql/20220831123023_InitialCreate.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
22
// Licensed under the Apache License, Version 2.0
33

4-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
54
using Microsoft.EntityFrameworkCore.Migrations;
65
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
76

87
namespace Moryx.ControlSystem.ProcessEngine.Model.Migrations.Npgsql
98
{
9+
/// <inheritdoc />
1010
public partial class InitialCreate : Migration
1111
{
12+
/// <inheritdoc />
1213
protected override void Up(MigrationBuilder migrationBuilder)
1314
{
1415
migrationBuilder.EnsureSchema(
@@ -191,6 +192,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
191192
column: "ProcessId");
192193
}
193194

195+
/// <inheritdoc />
194196
protected override void Down(MigrationBuilder migrationBuilder)
195197
{
196198
migrationBuilder.DropTable(

‎src/Moryx.ControlSystem.ProcessEngine/Model/Migrations/Sqlite/20230216064711_InitialCreate.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
22
// Licensed under the Apache License, Version 2.0
33

4-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
54
using Microsoft.EntityFrameworkCore.Migrations;
65

76
#nullable disable
87

98
namespace Moryx.ControlSystem.ProcessEngine.Model.Migrations.Sqlite
109
{
10+
/// <inheritdoc />
1111
public partial class InitialCreate : Migration
1212
{
13+
/// <inheritdoc />
1314
protected override void Up(MigrationBuilder migrationBuilder)
1415
{
1516
migrationBuilder.EnsureSchema(
@@ -188,6 +189,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
188189
column: "ProcessId");
189190
}
190191

192+
/// <inheritdoc />
191193
protected override void Down(MigrationBuilder migrationBuilder)
192194
{
193195
migrationBuilder.DropTable(

‎src/Moryx.ControlSystem.ProcessEngine/Model/NpgsqlProcessContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Moryx.ControlSystem.ProcessEngine.Model
88
{
99
/// <summary>
10-
/// The Npgsql DbContext of this database model.
10+
/// Npgsql specific implementation of <see cref="ProcessContext"/>
1111
/// </summary>
1212
[NpgsqlDbContext(typeof(ProcessContext))]
1313
public class NpgsqlProcessContext : ProcessContext

‎src/Moryx.ControlSystem.ProcessEngine/Model/ProcessContext.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
using Microsoft.EntityFrameworkCore;
55
using Moryx.Model;
6+
7+
// ReSharper disable UnusedMember.Global
68
// ReSharper disable VirtualMemberNeverOverridden.Global
9+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
710

811
namespace Moryx.ControlSystem.ProcessEngine.Model
912
{

‎src/Moryx.ControlSystem.ProcessEngine/Model/SqliteProcessContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Moryx.ControlSystem.ProcessEngine.Model
88
{
99
/// <summary>
10-
/// The Sqlite DbContext of this database model.
10+
/// Sqlite specific implementation of <see cref="ProcessContext"/>
1111
/// </summary>
1212
[SqliteDbContext(typeof(ProcessContext))]
1313
public class SqliteProcessContext : ProcessContext

‎src/Moryx.ControlSystem.ProcessEngine/Moryx.ControlSystem.ProcessEngine.csproj.DotSettings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=material_005Cimplementation/@EntryIndexedValue">True</s:Boolean>
2626
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=model_005Capi/@EntryIndexedValue">True</s:Boolean>
2727
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=model_005Centities/@EntryIndexedValue">True</s:Boolean>
28-
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=model_005Cmigrations/@EntryIndexedValue">True</s:Boolean>
28+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=model_005Cmigrations/@EntryIndexedValue">False</s:Boolean>
2929
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=modulecontroller/@EntryIndexedValue">True</s:Boolean>
3030
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ModuleController/@EntryIndexedValue">True</s:Boolean>
3131
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=Processes_005CComponents/@EntryIndexedValue">True</s:Boolean>

‎src/Moryx.Notifications.Publisher/Model/API/INotificationEntityRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
55
using Moryx.Model.Repositories;
66

7-
namespace Moryx.Notifications.Model
7+
namespace Moryx.Notifications.Publisher.Model
88
{
99
public interface INotificationEntityRepository : IRepository<NotificationEntity>
1010
{

‎src/Moryx.Notifications.Publisher/Model/API/INotificationTypeEntityRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
55
using Moryx.Model.Repositories;
66

7-
namespace Moryx.Notifications.Model
7+
namespace Moryx.Notifications.Publisher.Model
88
{
99
public interface INotificationTypeEntityRepository : IRepository<NotificationTypeEntity>
1010
{

‎src/Moryx.Notifications.Publisher/Model/Entities/NotificationEntity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.ComponentModel.DataAnnotations.Schema;
66
using Moryx.Model;
77

8-
namespace Moryx.Notifications.Model
8+
namespace Moryx.Notifications.Publisher.Model
99
{
1010
public class NotificationEntity : EntityBase
1111
{

0 commit comments

Comments
 (0)