Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MP-8148 [BS-8103] NOX - Database configuration for "DateTime" #470

Merged
merged 26 commits into from
Aug 17, 2023
Merged

MP-8148 [BS-8103] NOX - Database configuration for "DateTime" #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a712aaa
MP-8148 [BS-8103] NOX - Database configuration for "DateTime"
ajlabecic-ba Aug 1, 2023
4321777
MP-8148 [BS-8103] NOX - Database configuration for "DateTime"
ajlabecic-ba Aug 1, 2023
382688b
datetimeoffset
ajlabecic-ba Aug 8, 2023
befc25f
merge main
ajlabecic-ba Aug 8, 2023
a4be56a
fix integration tests
ajlabecic-ba Aug 8, 2023
543cb50
gnerate schema
ajlabecic-ba Aug 8, 2023
4f35f6a
merge main
ajlabecic-ba Aug 14, 2023
7930c3d
adjust database for datatimeoffset
ajlabecic-ba Aug 14, 2023
6610780
fix comments
ajlabecic-ba Aug 14, 2023
fd5d9e7
fix tests
ajlabecic-ba Aug 14, 2023
0e28af9
comment tests
ajlabecic-ba Aug 14, 2023
cb12f82
commit
ajlabecic-ba Aug 14, 2023
b54a9fc
add converter
ajlabecic-ba Aug 15, 2023
201002f
alter coverter
ajlabecic-ba Aug 16, 2023
bdd4a87
update validation
ajlabecic-ba Aug 16, 2023
f21ee6d
change variable
ajlabecic-ba Aug 16, 2023
f62a3e8
change method name
ajlabecic-ba Aug 16, 2023
6b5113e
small changes
ajlabecic-ba Aug 16, 2023
0d4051c
add from override
ajlabecic-ba Aug 16, 2023
070057e
postges revert
ajlabecic-ba Aug 16, 2023
5181748
Merge branch 'main' into feature/MP-8148
rochar Aug 16, 2023
7d2d9a0
add datetime to entity mapper
rochar Aug 16, 2023
e5e273e
fix unit tests
rochar Aug 16, 2023
3f4b526
save datetime as datetimeoffset in sql and utc in PostGres
rochar Aug 17, 2023
b822412
add migrations
rochar Aug 17, 2023
b3cb6c9
fix namespaces and file locations
rochar Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .nox/design/allnoxtypes.entity.nox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ attributes:
type: currencyCode3
isRequired: false

# - name: DateTimeField
# description: DatetimeField Nox Type
# type: dateTime
# isRequired: false
- name: DateTimeField
description: DatetimeField Nox Type
type: dateTime
isRequired: false

- name: FormulaField
description: Formula Nox Type
Expand Down
30 changes: 12 additions & 18 deletions schemas/domainCommand.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,17 +1672,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down Expand Up @@ -5613,17 +5611,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down Expand Up @@ -9303,17 +9299,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down
30 changes: 12 additions & 18 deletions schemas/dto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1645,17 +1645,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down Expand Up @@ -5573,17 +5571,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down Expand Up @@ -9107,17 +9103,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down
10 changes: 4 additions & 6 deletions schemas/type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,17 +1179,15 @@
"properties": {
"minValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"maxValue": {
"type": [
"string",
"object",
"null"
],
"format": "date-time"
]
},
"allowFutureOnly": {
"type": [
Expand Down
2 changes: 1 addition & 1 deletion src/Nox.EntityFramework.Postgres/PostgresMarkdownDatabaseConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Nox.EntityFramework.Postgres;

public class PostgresMarkdownDatabaseConfiguration : MarkdownDatabaseConfigurator
public class PostgresMarkdownDatabaseConfiguration : MarkdownDatabaseConfigurator, IPostgresNoxTypeDatabaseConfigurator
{
public override bool IsDefault => false;

Expand Down
2 changes: 1 addition & 1 deletion src/Nox.EntityFramework.Postgres/PostgresTextDatabaseConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace Nox.EntityFramework.Postgres;

public class PostgresTextDatabaseConfiguration : TextDatabaseConfigurator
public class PostgresTextDatabaseConfiguration : TextDatabaseConfigurator, IPostgresNoxTypeDatabaseConfigurator
{
public override bool IsDefault => false;

Expand Down
13 changes: 13 additions & 0 deletions src/Nox.EntityFramework.Postgres/Types/DateTime/PostgresDateTimeConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;


namespace Nox.EntityFramework.Postgres.Types.DateTime;

public class PostgresDateTimeConverter : ValueConverter<Nox.Types.DateTime, System.DateTime>
{
public PostgresDateTimeConverter()
: base(
dateTime => dateTime.Value.UtcDateTime,
dateTimeValue => Nox.Types.DateTime.FromDatabase(new DateTimeOffset(dateTimeValue, TimeSpan.Zero)))
{ }
}
24 changes: 24 additions & 0 deletions src/Nox.EntityFramework.Postgres/Types/DateTime/PostgresDateTimeDatabaseConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Nox.Solution;
using Nox.Types;
using Nox.Types.EntityFramework.Types;

namespace Nox.EntityFramework.Postgres.Types.DateTime;

public class PostgresDateTimeDatabaseConfiguration : DateTimeDatabaseConfigurator, IPostgresNoxTypeDatabaseConfigurator
{
public override bool IsDefault => false;

public override void ConfigureEntityProperty(
NoxSolutionCodeGeneratorState noxSolutionCodeGeneratorState,
EntityTypeBuilder builder,
NoxSimpleTypeDefinition property,
Entity entity,
bool isKey)
{
builder
.Property(property.Name)
.IsRequired(property.IsRequired)
.HasConversion<PostgresDateTimeConverter>();
}
}
2 changes: 1 addition & 1 deletion src/Nox.Types.Abstractions/Enums/NoxType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public enum NoxType : uint
[SimpleType(typeof(short))]
Year = 3709785124,

[SimpleType(typeof(DateTime))]
[SimpleType(typeof(DateTimeOffset))]
DateTime = 2998644573,

[SimpleType(typeof(TimeSpan))]
Expand Down
10 changes: 6 additions & 4 deletions src/Nox.Types.Abstractions/TypeOptions/DateTimeTypeOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@

using System;

namespace Nox.Types;
public class DateTimeTypeOptions : INoxTypeOptions
{
public static readonly System.DateTime DefaultMinValue = System.DateTime.MinValue;
public static readonly System.DateTime DefaultMaxValue = System.DateTime.MaxValue;
public System.DateTime MinValue { get; set; } = DefaultMinValue;
public System.DateTime MaxValue { get; set; } = DefaultMaxValue;
public static readonly DateTimeOffset DefaultMinValue = DateTimeOffset.MinValue;
public static readonly DateTimeOffset DefaultMaxValue = DateTimeOffset.MaxValue;
public DateTimeOffset MinValue { get; set; } = DefaultMinValue;
public DateTimeOffset MaxValue { get; set; } = DefaultMaxValue;
public bool AllowFutureOnly { get; set; } = false;
}

13 changes: 8 additions & 5 deletions src/Nox.Types.EntityFramework/Types/DateTime/DateTimeConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;

namespace Nox.Types.EntityFramework.Types;

public class DateTimeConverter : ValueConverter<DateTime, System.DateTime>
public class DateTimeConverter : ValueConverter<DateTime, DateTimeOffset>
{
public DateTimeConverter() : base(dt => dt.Value, dtValue => DateTime.From(dtValue)) { }

}
public DateTimeConverter()
: base(
d => d.Value,
d => DateTime.FromDatabase(d))
{ }
}
23 changes: 23 additions & 0 deletions src/Nox.Types.EntityFramework/Types/DateTime/DateTimeDatabaseConfigurator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Nox.Solution;
using Nox.Types.EntityFramework.Abstractions;

namespace Nox.Types.EntityFramework.Types;
public class DateTimeDatabaseConfigurator : INoxTypeDatabaseConfigurator
{
public NoxType ForNoxType => NoxType.DateTime;

public virtual bool IsDefault => true;

public virtual void ConfigureEntityProperty(NoxSolutionCodeGeneratorState noxSolutionCodeGeneratorState, EntityTypeBuilder builder, NoxSimpleTypeDefinition property, Entity entity, bool isKey)
{
builder
.Property(property.Name)
.IsRequired(property.IsRequired)
.HasConversion<DateTimeConverter>();
}

public string GetKeyPropertyName(NoxSimpleTypeDefinition key) => key.Name;
}

4 changes: 2 additions & 2 deletions ...s/DateTimeRange/DateTimeRangeConverter.cs → ...ramework/Types/DateTimeOffsetConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Nox.Types.EntityFramework.Types;

public class DateTimeRangeConverter : ValueConverter<DateTimeOffset, System.DateTime>
public class DateTimeOffsetConverter : ValueConverter<DateTimeOffset, System.DateTime>
{
public DateTimeRangeConverter()
public DateTimeOffsetConverter()
: base(
d => d.UtcDateTime,
d => new DateTimeOffset(d, TimeSpan.Zero))
Expand Down
4 changes: 2 additions & 2 deletions src/Nox.Types.EntityFramework/Types/DateTimeRange/DateTimeRangeDatabaseConfigurator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ public void ConfigureEntityProperty(
.OwnsOne(typeof(DateTimeRange), property.Name, dtr =>
{
dtr.Property(nameof(DateTimeRange.Start))
.HasConversion<DateTimeRangeConverter>();
.HasConversion<DateTimeOffsetConverter>();

dtr.Property(nameof(DateTimeRange.End))
.HasConversion<DateTimeRangeConverter>();
.HasConversion<DateTimeOffsetConverter>();

dtr.Property(nameof(DateTimeRange.StartTimeZoneOffset))
.UsePropertyAccessMode(PropertyAccessMode.Property);
Expand Down
Loading