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.

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

Implemented Postgres #2147

Draft
wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions src/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/.idea
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
13 changes: 13 additions & 0 deletions src/.idea/.idea.FluentCMS/.idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Backend/FluentCMS.Entities/GlobalSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

public class GlobalSettings : AuditableEntity
{
public FileUploadConfig FileUpload { get; set; } = default!;
public IEnumerable<string> SuperAdmins { get; set; } = [];
public FileUploadConfig? FileUpload { get; set; } = default!;
public List<string> SuperAdmins { get; set; } = [];
public bool Initialized { get; set; } = false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Backend/FluentCMS.Entities/PluginDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class PluginDefinition : AuditableEntity
{
public string Name { get; set; } = default!;
public string Category { get; set; } = default!;
public string? Category { get; set; } = default!;
public string Assembly { get; set; } = default!;
public string? Description { get; set; }
public IEnumerable<PluginDefinitionType> Types { get; set; } = [];
Expand Down
3 changes: 3 additions & 0 deletions src/Backend/FluentCMS.Services/SetupService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,8 @@ private static void SetIds(SetupTemplate setupTemplate)

foreach (var contentType in setupTemplate.ContentTypes)
contentType.Id = Guid.NewGuid();

foreach (var layout in setupTemplate.Site.Layouts)
layout.Id = Guid.NewGuid();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class ApiTokenConfiguration : AuditableEntityConfigurationBase<ApiToken>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace FluentCMS.Repositories.Postgres.Configurations.Base;

public class AuditableEntityConfigurationBase<T> : EntityConfigurationBase<T> where T : AuditableEntity
{
public override void Configure(EntityTypeBuilder<T> entity)
{
base.Configure(entity);

entity.Property(x => x.CreatedAt).HasColumnType("timestamp with time zone");
entity.Property(x => x.ModifiedAt).HasColumnType("timestamp with time zone");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace FluentCMS.Repositories.Postgres.Configurations.Base;

public class EntityConfigurationBase<T> : IEntityTypeConfiguration<T> where T : Entity
{
public virtual void Configure(EntityTypeBuilder<T> builder)
{
builder.HasKey(x => x.Id);
}


}

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace FluentCMS.Repositories.Postgres.Configurations.Base;

public class ShadowKeyEntityBaseConfiguration<T> : IEntityTypeConfiguration<T> where T : class
{
public virtual void Configure(EntityTypeBuilder<T> builder)
{
builder.Property<Guid>("Id").ValueGeneratedOnAdd();

builder.HasKey("Id");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace FluentCMS.Repositories.Postgres.Configurations.Base;

public class SiteAssociatedEntityConfigurationBase<T> : AuditableEntityConfigurationBase<T> where T : SiteAssociatedEntity
{
public override void Configure(EntityTypeBuilder<T> entity)
{
base.Configure(entity);

entity.HasOne<Site>()
.WithMany()
.HasForeignKey(x => x.SiteId);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class ContentConfiguration : AuditableEntityConfigurationBase<Content>
{
public override void Configure(EntityTypeBuilder<Content> entity)
{
base.Configure(entity);

entity.OwnsOne(x => x.Data, builder => {builder.ToJson(); });
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class ContentTypeConfiguration : AuditableEntityConfigurationBase<ContentType>
{
public override void Configure(EntityTypeBuilder<ContentType> entity)
{
base.Configure(entity);

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class ContentTypeFieldConfiguration : ShadowKeyEntityBaseConfiguration<ContentTypeField>
{
public override void Configure(EntityTypeBuilder<ContentTypeField> entity)
{
base.Configure(entity);

entity.Property(x => x.Settings).HasColumnType("jsonb");

entity.HasOne<ContentType>()
.WithMany()
.HasForeignKey("TypeId");

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class FileConfiguration : AuditableEntityConfigurationBase<File>
{
public override void Configure(EntityTypeBuilder<File> entity)
{
base.Configure(entity);

entity.HasOne<Folder>()
.WithMany()
.HasForeignKey(x => x.FolderId);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class FolderConfiguration : AuditableEntityConfigurationBase<Folder>
{
public override void Configure(EntityTypeBuilder<Folder> entity)
{
base.Configure(entity);

entity.HasOne<Folder>()
.WithMany()
.HasForeignKey(x => x.FolderId);

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class GlobalSettingsConfiguration : AuditableEntityConfigurationBase<GlobalSettings>
{
public override void Configure(EntityTypeBuilder<GlobalSettings> entity)
{
base.Configure(entity);

entity.OwnsOne(x => x.FileUpload, builder => { builder.ToJson(); });

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class PluginDefinitionConfiguration : AuditableEntityConfigurationBase<PluginDefinition>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace FluentCMS.Repositories.Postgres.Configurations;

public class PluginDefinitionTypeConfiguration : IEntityTypeConfiguration<PluginDefinitionType>
{
public void Configure(EntityTypeBuilder<PluginDefinitionType> builder)
{
builder.HasKey(x => new{x.Type, x.Name});

builder.HasOne<PluginDefinition>()
.WithMany()
.HasForeignKey("DefinitionId");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class PolicyConfiguration : ShadowKeyEntityBaseConfiguration<Policy>
{
public override void Configure(EntityTypeBuilder<Policy> entity)
{
base.Configure(entity);

entity.OwnsOne(x => x.Actions, builder => { builder.ToJson(); });
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations;

public class SettingsConfiguration : AuditableEntityConfigurationBase<Settings>
{
public override void Configure(EntityTypeBuilder<Settings> entity)
{
base.Configure(entity);

entity.OwnsOne(x => x.Values, builder => { builder.ToJson(); });
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class BlockConfiguration : SiteAssociatedEntityConfigurationBase<Block>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class LayoutConfiguration : SiteAssociatedEntityConfigurationBase<Layout>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class PageConfiguration : SiteAssociatedEntityConfigurationBase<Page>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class PermissionConfiguration : SiteAssociatedEntityConfigurationBase<Permission>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class PluginConfiguration : SiteAssociatedEntityConfigurationBase<Plugin>
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class PluginContentConfiguration : SiteAssociatedEntityConfigurationBase<PluginContent>
{
public override void Configure(EntityTypeBuilder<PluginContent> entity)
{
base.Configure(entity);

entity.HasOne<Plugin>()
.WithMany()
.HasForeignKey(x => x.PluginId);

entity.OwnsOne(x => x.Data, builder => builder.ToJson());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class RoleConfiguration : SiteAssociatedEntityConfigurationBase<Role>
{
public override void Configure(EntityTypeBuilder<Role> entity)
{
base.Configure(entity);

entity.Property(x => x.Type).HasConversion<string>();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class SiteConfiguration : AuditableEntityConfigurationBase<Site>
{
public override void Configure(EntityTypeBuilder<Site> entity)
{
base.Configure(entity);

entity.OwnsOne(x => x.Urls, builder => builder.ToJson());

entity.HasOne<Layout>()
.WithMany()
.HasForeignKey(x => x.LayoutId);

entity.HasOne<Layout>()
.WithMany()
.HasForeignKey(x => x.DetailLayoutId);

entity.HasOne<Layout>()
.WithMany()
.HasForeignKey(x => x.EditLayoutId);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using FluentCMS.Repositories.Postgres.Configurations.Base;

namespace FluentCMS.Repositories.Postgres.Configurations.SiteAssociatedEntities;

public class UserRoleConfiguration : SiteAssociatedEntityConfigurationBase<UserRole>
{
public override void Configure(EntityTypeBuilder<UserRole> entity)
{
base.Configure(entity);

entity.HasOne<Entities.User>()
.WithMany()
.HasForeignKey(x => x.UserId);

entity.HasOne<Role>()
.WithMany()
.HasForeignKey(x => x.RoleId);
}
}
Loading