Added new features / Bug fixed

・カレンダーにFullCalendarを使用する機能を追加。・システムログにClientIDを書き込む機能を追加。・PostgreSQLの環境でCodeDefineによるDBのマイグレートが失敗する問題を解消。・URLにサブディレクトリを含む環境でログイン後のURL及びトップ画面のURLが正しく生成されない問題を解消。・サーバスクリプトitems.NewSiteで作成したapiModelオブジェクトにサイトの各種設定内容を登録できない問題を解消。・x86環境以外でDockerによるビルドが行えない問題を解消。
Implem · Sep 3, 2023 · 1be7c56 · 1be7c56
1 parent fef4b03
commit 1be7c56
Show file tree

Hide file tree

Showing 51 changed files with 1,271 additions and 437 deletions.
diff --git a/Implem.CodeDefiner/Dockerfile b/Implem.CodeDefiner/Dockerfile
@@ -1,8 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
-RUN apt-get update && apt-get install -y curl
-
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
 COPY ["Implem.CodeDefiner/Implem.CodeDefiner.csproj", "Implem.CodeDefiner/"]
@@ -21,10 +19,10 @@ RUN dotnet build "Implem.CodeDefiner/Implem.CodeDefiner.csproj" -c Release -o /a
 RUN dotnet build "Implem.Pleasanter/Implem.Pleasanter.csproj" -c Release -o /app/build/Implem.Pleasanter
 
 FROM build AS publish
+RUN apt-get update && apt-get install -y jq
 RUN dotnet publish "Implem.CodeDefiner/Implem.CodeDefiner.csproj" -c Release -o /app/publish/Implem.CodeDefiner
 RUN dotnet publish "Implem.Pleasanter/Implem.Pleasanter.csproj" -c Release -o /app/publish/Implem.Pleasanter
-RUN curl -o /usr/bin/jq -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x /usr/bin/jq && \
-    cat Implem.Pleasanter/App_Data/Parameters/Rds.json \
+RUN cat Implem.Pleasanter/App_Data/Parameters/Rds.json \
     | jq '.Dbms|="PostgreSQL" | .SaConnectionString|=null | .OwnerConnectionString|=null | .UserConnectionString|=null' \
     > /app/publish/Implem.Pleasanter/App_Data/Parameters/Rds.json
 

diff --git a/Implem.CodeDefiner/Functions/Rds/RdsConfigurator.cs b/Implem.CodeDefiner/Functions/Rds/RdsConfigurator.cs
@@ -12,6 +12,10 @@ internal static void Configure(ISqlObjectFactory factory)
             {
                 CreateDatabase(factory: factory, databaseName: Environments.ServiceName);
             }
+            else
+            {
+                UpdateDatabase(factory: factory, databaseName: Environments.ServiceName);
+            }
         }
 
         private static void CreateDatabase(ISqlObjectFactory factory, string databaseName)
@@ -44,6 +48,30 @@ private static void CreateDatabase(ISqlObjectFactory factory, string databaseNam
                     .Replace("#Uid_Owner#", ocn["uid"]));
         }
 
+        private static void UpdateDatabase(ISqlObjectFactory factory, string databaseName)
+        {
+            Consoles.Write(Environments.ServiceName, Consoles.Types.Info);
+            var ocn = new TextData(Parameters.Rds.OwnerConnectionString, ';', '=');
+            var ucn = new TextData(Parameters.Rds.UserConnectionString, ';', '=');
+            Def.SqlIoBySa(factory).ExecuteNonQuery(
+                factory: factory,
+                dbTransaction: null,
+                dbConnection: null,
+                commandText: Def.Sql.CreateUserForPostgres
+                    .Replace("#Uid_Owner#", ocn["uid"])
+                    .Replace("#Pwd_Owner#", ocn["pwd"])
+                    .Replace("#Uid_User#", ucn["uid"])
+                    .Replace("#Pwd_User#", ucn["pwd"])
+                    .Replace("#SchemaName#", factory.SqlDefinitionSetting.SchemaName));
+            Def.SqlIoBySa(factory).ExecuteNonQuery(
+                factory: factory,
+                dbTransaction: null,
+                dbConnection: null,
+                commandText: Def.Sql.ChangeDatabaseOwnerForPostgres
+                    .Replace("#InitialCatalog#", databaseName)
+                    .Replace("#Uid_Owner#", ocn["uid"]));
+        }
+
         private static bool Exists(ISqlObjectFactory factory, string databaseName)
         {
             var isExists = Def.SqlIoBySa(factory).ExecuteTable(

diff --git a/Implem.CodeDefiner/Functions/Rds/SchemaConfigurator.cs b/Implem.CodeDefiner/Functions/Rds/SchemaConfigurator.cs
@@ -9,10 +9,10 @@ internal static class SchemaConfigurator
         internal static void Configure(ISqlObjectFactory factory)
         {
             Consoles.Write(factory.SqlDefinitionSetting.SchemaName, Consoles.Types.Info);
+            var ocn = new TextData(Parameters.Rds.OwnerConnectionString, ';', '=');
+            var ucn = new TextData(Parameters.Rds.UserConnectionString, ';', '=');
             if (factory.SqlDefinitionSetting.IsCreatingDb)
             {
-                var ocn = new TextData(Parameters.Rds.OwnerConnectionString, ';', '=');
-                var ucn = new TextData(Parameters.Rds.UserConnectionString, ';', '=');
                 Def.SqlIoByAdmin(factory).ExecuteNonQuery(
                     factory: factory,
                     dbTransaction: null,
@@ -22,6 +22,17 @@ internal static void Configure(ISqlObjectFactory factory)
                         .Replace("#Uid_User#", ucn["uid"])
                         .Replace("#SchemaName#", factory.SqlDefinitionSetting.SchemaName));
             }
+            else
+            {
+                Def.SqlIoByAdmin(factory).ExecuteNonQuery(
+                    factory: factory,
+                    dbTransaction: null,
+                    dbConnection: null,
+                    commandText: Def.Sql.GrantDatabaseForPostgres
+                        .Replace("#Uid_Owner#", ocn["uid"])
+                        .Replace("#Uid_User#", ucn["uid"])
+                        .Replace("#SchemaName#", factory.SqlDefinitionSetting.SchemaName));
+            }
         }
     }
 }
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
     <Description>This program does the automatic code creation and merging of existing code based on the definition. Also it will make the configuration change of sql server database.</Description>
-    <AssemblyVersion>1.3.45.0</AssemblyVersion>
-    <FileVersion>1.3.45.0</FileVersion>
-    <Version>1.3.45.0</Version>
+    <AssemblyVersion>1.3.46.0</AssemblyVersion>
+    <FileVersion>1.3.46.0</FileVersion>
+    <Version>1.3.46.0</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Def.cs b/Implem.DefinitionAccessor/Def.cs
@@ -13434,6 +13434,8 @@ public class SqlColumn2nd
         public string CreateSchema;
         public string CreateDatabaseForPostgres;
         public string CreateUserForPostgres;
+        public string ChangeDatabaseOwnerForPostgres;
+        public string GrantDatabaseForPostgres;
     }
 
     /// <summary>
@@ -13486,5 +13488,7 @@ public class SqlTable
         public SqlDefinition CreateSchema = new SqlDefinition();
         public SqlDefinition CreateDatabaseForPostgres = new SqlDefinition();
         public SqlDefinition CreateUserForPostgres = new SqlDefinition();
+        public SqlDefinition ChangeDatabaseOwnerForPostgres = new SqlDefinition();
+        public SqlDefinition GrantDatabaseForPostgres = new SqlDefinition();
     }
 }
diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.45.0</AssemblyVersion>
-    <FileVersion>1.3.45.0</FileVersion>
-    <Version>1.3.45.0</Version>
+    <AssemblyVersion>1.3.46.0</AssemblyVersion>
+    <FileVersion>1.3.46.0</FileVersion>
+    <Version>1.3.46.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.45.0</AssemblyVersion>
-    <FileVersion>1.3.45.0</FileVersion>
-    <Version>1.3.45.0</Version>
+    <AssemblyVersion>1.3.46.0</AssemblyVersion>
+    <FileVersion>1.3.46.0</FileVersion>
+    <Version>1.3.46.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -3,13 +3,14 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.45.0</AssemblyVersion>
-    <FileVersion>1.3.45.0</FileVersion>
-    <Version>1.3.45.0</Version>
+    <AssemblyVersion>1.3.46.0</AssemblyVersion>
+    <FileVersion>1.3.46.0</FileVersion>
+    <Version>1.3.46.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Implem.Libraries\Implem.Libraries.csproj" />
     <ProjectReference Include="..\Rds\Implem.IRds\Implem.IRds.csproj" />
     <ProjectReference Include="..\Rds\Implem.PostgreSql\Implem.PostgreSql.csproj" />
     <ProjectReference Include="..\Rds\Implem.SqlServer\Implem.SqlServer.csproj" />

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.45.0</AssemblyVersion>
-    <FileVersion>1.3.45.0</FileVersion>
-    <Version>1.3.45.0</Version>
+    <AssemblyVersion>1.3.46.0</AssemblyVersion>
+    <FileVersion>1.3.46.0</FileVersion>
+    <Version>1.3.46.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2023</Copyright>
-    <AssemblyVersion>1.3.45.0</AssemblyVersion>
-    <FileVersion>1.3.45.0</FileVersion>
-    <Version>1.3.45.0</Version>
+    <AssemblyVersion>1.3.46.0</AssemblyVersion>
+    <FileVersion>1.3.46.0</FileVersion>
+    <Version>1.3.46.0</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Parts/General.cs b/Implem.ParameterAccessor/Parts/General.cs
@@ -62,6 +62,7 @@ public class General
         public int CalendarEnd;
         public int CalendarLimit;
         public int CalendarYLimit;
+        public int DefaultCalendarType;
         public int CrosstabBegin;
         public int CrosstabEnd;
         public int CrosstabXLimit;

diff --git a/Implem.ParameterAccessor/Parts/SysLog.cs b/Implem.ParameterAccessor/Parts/SysLog.cs
@@ -8,6 +8,7 @@ public class SysLog
         public bool LoginSuccess;
         public bool LoginFailure;
         public bool SignOut;
+        public bool ClientId;
         public int ExportLimit;
     }
 }
diff --git a/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_Calendar_Body.txt b/Implem.Pleasanter/App_Data/Definitions/Definition_Code/Model_Utilities_Calendar_Body.txt
@@ -32,12 +32,19 @@
             choices?.Count ?? 0);
     var begin = Calendars.BeginDate(
         context: context,
+        ss: ss,
         date: date,
-        timePeriod: timePeriod);
+        timePeriod: timePeriod,
+        view: view);
     var end = Calendars.EndDate(
         context: context,
+        ss: ss,
         date: date,
-        timePeriod: timePeriod);
+        timePeriod: timePeriod,
+        view: view);
+    var CalendarViewType = !string.IsNullOrEmpty(view.CalendarViewType)
+        ? view.CalendarViewType
+        : "dayGridMonth";
     var dataRows = inRangeY
         ? CalendarDataRows(
             context: context,
@@ -73,6 +80,8 @@
                 toColumn: toColumn,
                 date: date,
                 begin: begin,
+                end: end,
+                CalendarViewType: CalendarViewType,
                 choices: choices,
                 dataRows: dataRows,
                 bodyOnly: false,
@@ -162,12 +171,19 @@ public static string CalendarJson(
             choices?.Count ?? 0);
     var begin = Calendars.BeginDate(
         context: context,
+        ss: ss,
         date: date,
-        timePeriod: timePeriod);
+        timePeriod: timePeriod,
+        view: view);
     var end = Calendars.EndDate(
         context: context,
+        ss: ss,
         date: date,
-        timePeriod: timePeriod);
+        timePeriod: timePeriod,
+        view: view);
+    var CalendarViewType = !string.IsNullOrEmpty(view.CalendarViewType)
+        ? view.CalendarViewType
+        : "dayGridMonth";
     var dataRows = inRangeY 
         ? CalendarDataRows(
             context: context,
@@ -193,12 +209,20 @@ public static string CalendarJson(
         toColumn: toColumn,
         date: date,
         begin: begin,
+        end: end,
+        CalendarViewType: CalendarViewType,
         choices: choices,
         dataRows: dataRows,
         bodyOnly: bodyOnly,
         showStatus: view.CalendarShowStatus == true,
         inRange: inRange,
         changedItemId: changedItemId);
+    var CalendarBodyName = "";
+    if (ss.CalendarType.ToString() == "Standard"){
+        CalendarBodyName = "#CalendarBody";
+    } else {
+        CalendarBodyName = "#FullCalendarBody";
+    }
     if (inRange)
     {
         return new ResponseCollection(context: context)
@@ -210,7 +234,7 @@ public static string CalendarJson(
                 message: message,
                 loadScroll: update,
                 bodyOnly: bodyOnly,
-                bodySelector: "#CalendarBody",
+                bodySelector: CalendarBodyName,
                 body: body)
             .Events("on_calendar_load")
             .ToJson();
@@ -230,7 +254,7 @@ public static string CalendarJson(
                         context: context,
                         data: Parameters.General.CalendarYLimit.ToString()),
                 bodyOnly: bodyOnly,
-                bodySelector: "#CalendarBody",
+                bodySelector: CalendarBodyName,
                 body: body)
             .Events("on_calendar_load")
             .ToJson();
@@ -317,6 +341,8 @@ private static HtmlBuilder Calendar(
     Column toColumn,
     DateTime date,
     DateTime begin,
+    DateTime end,
+    string CalendarViewType,
     Dictionary<string, ControlData> choices,
     EnumerableRowCollection<DataRow> dataRows,
     bool bodyOnly,
@@ -334,6 +360,8 @@ private static HtmlBuilder Calendar(
             toColumn: toColumn,
             date: date,
             begin: begin,
+            end: end,
+            CalendarViewType: CalendarViewType,
             choices: choices,
             dataRows: dataRows,
             showStatus: showStatus,
@@ -348,6 +376,8 @@ private static HtmlBuilder Calendar(
             toColumn: toColumn,
             date: date,
             begin: begin,
+            end: end,
+            CalendarViewType: CalendarViewType,
             choices: choices,
             dataRows: dataRows,
             showStatus: showStatus,

diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/ChangeDatabaseOwnerForPostgres.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/ChangeDatabaseOwnerForPostgres.sql
@@ -0,0 +1 @@
+alter database "#InitialCatalog#" owner to "#Uid_Owner#";
diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/CreateDatabaseForPostgres.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/CreateDatabaseForPostgres.sql
@@ -1 +1 @@
-CREATE DATABASE "#InitialCatalog#" OWNER "#Uid_Owner#";
+create database "#InitialCatalog#" owner "#Uid_Owner#";
diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/CreateSchema.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/CreateSchema.sql
@@ -1,3 +1,3 @@
-CREATE SCHEMA "#SchemaName#" AUTHORIZATION "#Uid_Owner#";
-GRANT USAGE ON SCHEMA "#SchemaName#" TO "#Uid_User#";
-CREATE EXTENSION IF NOT EXISTS pg_trgm;
+create schema "#SchemaName#" authorization "#Uid_Owner#";
+grant usage on schema "#SchemaName#" to "#Uid_User#";
+create extension if not exists pg_trgm;
diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/CreateUserForPostgres.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/CreateUserForPostgres.sql
@@ -1,7 +1,14 @@
-CREATE USER "#Uid_Owner#" WITH LOGIN PASSWORD '#Pwd_Owner#' valid until 'infinity';
+do $$
+begin
+  if not exists (select * from pg_user where usename = '#Uid_Owner#') then
+     create user "#Uid_Owner#" with login password '#Pwd_Owner#' valid until 'infinity';
+     create user "#Uid_User#" with login password '#Pwd_User#' valid until 'infinity';
+  end if;
+end $$
+;
 
-ALTER ROLE "#Uid_Owner#";
-CREATE USER "#Uid_User#" WITH LOGIN PASSWORD '#Pwd_User#' valid until 'infinity';
+alter role "#Uid_Owner#";
+
+alter user "#Uid_Owner#" set search_path to "#SchemaName#";
+alter user "#Uid_User#" set search_path to "#SchemaName#";
 
-ALTER USER "#Uid_Owner#" SET search_path TO "#SchemaName#";
-ALTER USER "#Uid_User#" SET search_path TO "#SchemaName#";
diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/GrantDatabaseForPostgres.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/PostgreSQL/GrantDatabaseForPostgres.sql
@@ -0,0 +1,2 @@
+grant usage on schema "#SchemaName#" to "#Uid_User#";
+create extension if not exists pg_trgm;
diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/SQLServer/ChangeDatabaseOwnerForPostgres.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/SQLServer/ChangeDatabaseOwnerForPostgres.sql
@@ -0,0 +1 @@
+select 1 as dummy;
diff --git a/Implem.Pleasanter/App_Data/Definitions/Sqls/SQLServer/GrantDatabaseForPostgres.sql b/Implem.Pleasanter/App_Data/Definitions/Sqls/SQLServer/GrantDatabaseForPostgres.sql
@@ -0,0 +1 @@
+select 1 as dummy;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		alter database "#InitialCatalog#" owner to "#Uid_Owner#";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CREATE DATABASE "#InitialCatalog#" OWNER "#Uid_Owner#";
		create database "#InitialCatalog#" owner "#Uid_Owner#";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		grant usage on schema "#SchemaName#" to "#Uid_User#";
		create extension if not exists pg_trgm;