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

Changed instance update to reflect various json merge needs #359

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Changed instance update to reflect various json merge needs #359

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2079807
Changed instance update to reflect various json merge needs. Cases:
HenningNormann Mar 22, 2024
5be03a8
Changed property of appsettings.json to "copy allways"
HenningNormann Apr 8, 2024
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
3 changes: 0 additions & 3 deletions src/Storage/Controllers/InstancesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,10 +610,7 @@ public async Task<ActionResult<Instance>> UpdateSubstatus(
try
{
List<string> updateProperties = [
nameof(instance.Status),
nameof(instance.Status.Substatus),
nameof(instance.Status.Substatus.Description),
nameof(instance.Status.Substatus.Label),
nameof(instance.LastChanged),
nameof(instance.LastChangedBy)
];
Expand Down
15 changes: 0 additions & 15 deletions src/Storage/Controllers/ProcessController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,21 +118,6 @@ public async Task<ActionResult<Instance>> PutProcess(
// Archiving instance if process was ended
List<string> updateProperties = [
nameof(existingInstance.Process),
nameof(existingInstance.Process.CurrentTask),
nameof(existingInstance.Process.CurrentTask.AltinnTaskType),
nameof(existingInstance.Process.CurrentTask.ElementId),
nameof(existingInstance.Process.CurrentTask.Ended),
nameof(existingInstance.Process.CurrentTask.Flow),
nameof(existingInstance.Process.CurrentTask.FlowType),
nameof(existingInstance.Process.CurrentTask.Name),
nameof(existingInstance.Process.CurrentTask.Started),
nameof(existingInstance.Process.CurrentTask.Validated),
nameof(existingInstance.Process.CurrentTask.Validated.Timestamp),
nameof(existingInstance.Process.CurrentTask.Validated.CanCompleteTask),
nameof(existingInstance.Process.Ended),
nameof(existingInstance.Process.EndEvent),
nameof(existingInstance.Process.Started),
nameof(existingInstance.Process.StartEvent),
nameof(existingInstance.LastChanged),
nameof(existingInstance.LastChangedBy)
];
Expand Down
135 changes: 135 additions & 0 deletions src/Storage/Migration/v0.06/01-functions-and-procedures.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
CREATE OR REPLACE FUNCTION storage.updateinstance_v2(
_alternateid UUID,
_toplevelsimpleprops JSONB,
_datavalues JSONB,
_completeconfirmations JSONB,
_presentationtexts JSONB,
_status JSONB,
_substatus JSONB,
_process JSONB,
_lastchanged TIMESTAMPTZ,
_taskid TEXT)
RETURNS TABLE (updatedInstance JSONB)
LANGUAGE 'plpgsql'
AS $BODY$
BEGIN
IF _datavalues IS NOT NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance || _toplevelsimpleprops ||
jsonb_strip_nulls(
jsonb_set(
'{"DataValues":""}',
'{DataValues}',
CASE WHEN instance -> 'DataValues' IS NOT NULL THEN
instance -> 'DataValues' || _datavalues
ELSE
_datavalues
END
)
),
lastchanged = _lastchanged
WHERE _alternateid = alternateid
RETURNING instance;
ELSIF _presentationtexts IS NOT NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance || _toplevelsimpleprops ||
jsonb_strip_nulls(
jsonb_set(
'{"PresentationTexts":""}',
'{PresentationTexts}',
CASE WHEN instance -> 'PresentationTexts' IS NOT NULL THEN
instance -> 'PresentationTexts' || _presentationtexts
ELSE
_presentationtexts
END
)
),
lastchanged = _lastchanged
WHERE _alternateid = alternateid
RETURNING instance;
ELSIF _completeconfirmations IS NOT NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance || _toplevelsimpleprops ||
jsonb_set(
'{"CompleteConfirmations":""}',
'{CompleteConfirmations}',
CASE WHEN instance -> 'CompleteConfirmations' IS NOT NULL THEN
instance -> 'CompleteConfirmations' || _completeconfirmations
ELSE
_completeconfirmations
END
),
lastchanged = _lastchanged
WHERE _alternateid = alternateid
RETURNING instance;
ELSIF _status IS NOT NULL AND _process IS NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance ||
jsonb_set(
instance || _toplevelsimpleprops,
'{Status}',
CASE WHEN instance -> 'Status' IS NOT NULL THEN
instance -> 'Status' || _status
ELSE
_status
END
),
lastchanged = _lastchanged
WHERE _alternateid = alternateid
RETURNING instance;
ELSIF _substatus IS NOT NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance ||
jsonb_set(
instance || _toplevelsimpleprops,
'{Status, Substatus}',
jsonb_strip_nulls(_substatus)
),
lastchanged = _lastchanged
WHERE _alternateid = alternateid
RETURNING instance;
ELSIF _process IS NOT NULL AND _status IS NOT NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance ||
jsonb_set(
instance || _toplevelsimpleprops,
'{Process}',
jsonb_strip_nulls(_process)
) ||
jsonb_set(
'{"Status":""}',
'{Status}',
CASE WHEN instance -> 'Status' IS NOT NULL THEN
instance -> 'Status' || _status
ELSE
_status
END
),
lastchanged = _lastchanged,
taskid = _taskid
WHERE _alternateid = alternateid
RETURNING instance;
ELSIF _process IS NOT NULL THEN
RETURN QUERY
UPDATE storage.instances SET
instance = instance ||
jsonb_set(
instance || _toplevelsimpleprops,
'{Process}',
jsonb_strip_nulls(_process)
),
lastchanged = _lastchanged,
taskid = _taskid
WHERE _alternateid = alternateid
RETURNING instance;
ELSE
RAISE EXCEPTION 'Unexpected parameters to update instance';
END IF;
END;
$BODY$;
18 changes: 11 additions & 7 deletions src/Storage/Repository/PgInstanceRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
private const string _readSqlFilteredInitial = "select * from storage.readinstancefromquery_v2 (";
private readonly string _deleteSql = "select * from storage.deleteinstance ($1)";
private readonly string _insertSql = "call storage.insertinstance ($1, $2, $3, $4, $5, $6, $7, $8)";
private readonly string _updateSql = "select * from storage.updateinstance ($1, $2, $3, $4, $5, $6)";
private readonly string _updateSql = "select * from storage.updateinstance_v2 (@_alternateid, @_toplevelsimpleprops, @_datavalues, @_completeconfirmations, @_presentationtexts, @_status, @_substatus, @_process, @_lastchanged, @_taskid)";
private readonly string _readSql = "select * from storage.readinstance ($1)";
private readonly string _readSqlFiltered = _readSqlFilteredInitial;
private readonly string _readDeletedSql = "select * from storage.readdeletedinstances ()";
Expand Down Expand Up @@ -127,7 +127,7 @@
{
while (await reader.ReadAsync())
{
Instance i = reader.GetFieldValue<Instance>("instance");

Check warning on line 130 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Define a constant instead of using this literal 'instance' 4 times. (https://rules.sonarsource.com/csharp/RSPEC-1192)
if (i.CompleteConfirmations != null && (i.CompleteConfirmations.Exists(c => c.StakeholderId.ToLower().Equals(i.Org) && c.ConfirmedOn <= DateTime.UtcNow.AddDays(-7))
|| !i.Status.IsArchived))
{
Expand Down Expand Up @@ -167,7 +167,7 @@

if (currentInstanceAllowsDelete)
{
elements.Add(reader.GetFieldValue<DataElement>("element"));

Check warning on line 170 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Define a constant instead of using this literal 'element' 5 times. (https://rules.sonarsource.com/csharp/RSPEC-1192)
}
}

Expand Down Expand Up @@ -196,9 +196,9 @@
NpgsqlDbType.TimestampTz => $"{((DateTime)value != DateTime.MinValue ? "'" + ((DateTime)value).ToString(DateTimeHelper.Iso8601UtcFormat, CultureInfo.InvariantCulture) + "'" : "NULL")}",
NpgsqlDbType.Integer => $"{value}",
NpgsqlDbType.Boolean => $"{value}",
NpgsqlDbType.Text | NpgsqlDbType.Array => ArrayVariableFromText((string[])value),

Check warning on line 199 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Remove this bitwise operation; the enum 'NpgsqlDbType' is not marked with 'Flags' attribute. (https://rules.sonarsource.com/csharp/RSPEC-3265)
NpgsqlDbType.Jsonb | NpgsqlDbType.Array => ArrayVariableFromJsonText((string[])value),

Check warning on line 200 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Remove this bitwise operation; the enum 'NpgsqlDbType' is not marked with 'Flags' attribute. (https://rules.sonarsource.com/csharp/RSPEC-3265)
NpgsqlDbType.Integer | NpgsqlDbType.Array => ArrayVariableFromInteger((int[])value),

Check warning on line 201 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Remove this bitwise operation; the enum 'NpgsqlDbType' is not marked with 'Flags' attribute. (https://rules.sonarsource.com/csharp/RSPEC-3265)
_ => throw new NotImplementedException()
};
}
Expand Down Expand Up @@ -377,12 +377,16 @@
instance.Data = null;
await using NpgsqlCommand pgcom = _dataSource.CreateCommand(_updateSql);
using TelemetryTracker tracker = new(_telemetryClient, pgcom);
pgcom.Parameters.AddWithValue(NpgsqlDbType.Uuid, new Guid(instance.Id));
pgcom.Parameters.AddWithValue(NpgsqlDbType.Jsonb, CustomSerializer.Serialize(instance, updateProperties));
pgcom.Parameters.AddWithValue(NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.DataValues)) ? instance.DataValues : DBNull.Value);
pgcom.Parameters.AddWithValue(NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.CompleteConfirmations)) ? instance.CompleteConfirmations : DBNull.Value);
pgcom.Parameters.AddWithValue(NpgsqlDbType.TimestampTz, instance.LastChanged ?? DateTime.UtcNow);
pgcom.Parameters.AddWithValue(NpgsqlDbType.Text, instance.Process?.CurrentTask?.ElementId ?? (object)DBNull.Value);
pgcom.Parameters.AddWithValue("_alternateid", NpgsqlDbType.Uuid, new Guid(instance.Id));
pgcom.Parameters.AddWithValue("_toplevelsimpleprops", NpgsqlDbType.Jsonb, CustomSerializer.Serialize(instance, updateProperties));
pgcom.Parameters.AddWithValue("_datavalues", NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.DataValues)) ? instance.DataValues : DBNull.Value);
pgcom.Parameters.AddWithValue("_completeconfirmations", NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.CompleteConfirmations)) ? instance.CompleteConfirmations : DBNull.Value);
pgcom.Parameters.AddWithValue("_presentationtexts", NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.PresentationTexts)) ? instance.PresentationTexts : DBNull.Value);
pgcom.Parameters.AddWithValue("_status", NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.Status)) ? CustomSerializer.Serialize(instance.Status, updateProperties) : DBNull.Value);
pgcom.Parameters.AddWithValue("_substatus", NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.Status.Substatus)) ? instance.Status.Substatus : DBNull.Value);
pgcom.Parameters.AddWithValue("_process", NpgsqlDbType.Jsonb, updateProperties.Contains(nameof(instance.Process)) ? instance.Process : DBNull.Value);
pgcom.Parameters.AddWithValue("_lastchanged", NpgsqlDbType.TimestampTz, instance.LastChanged ?? DateTime.UtcNow);
pgcom.Parameters.AddWithValue("_taskid", NpgsqlDbType.Text, instance.Process?.CurrentTask?.ElementId ?? (object)DBNull.Value);

await using NpgsqlDataReader reader = await pgcom.ExecuteReaderAsync();
if (await reader.ReadAsync())
Expand Down Expand Up @@ -533,7 +537,7 @@
{
// This dictionary should be sorted alphabetically by key to match the sorted parameter list to the db function
{ "_appId", NpgsqlDbType.Text },
{ "_appIds", NpgsqlDbType.Text | NpgsqlDbType.Array },

Check warning on line 540 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Remove this bitwise operation; the enum 'NpgsqlDbType' is not marked with 'Flags' attribute. (https://rules.sonarsource.com/csharp/RSPEC-3265)
{ "_archiveReference", NpgsqlDbType.Text },
{ "_continue_idx", NpgsqlDbType.Bigint },
{ "_created_eq", NpgsqlDbType.TimestampTz },
Expand All @@ -546,10 +550,10 @@
{ "_dueBefore_gte", NpgsqlDbType.Text },
{ "_dueBefore_lt", NpgsqlDbType.Text },
{ "_dueBefore_lte", NpgsqlDbType.Text },
{ "_excludeConfirmedBy", NpgsqlDbType.Jsonb | NpgsqlDbType.Array },

Check warning on line 553 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Remove this bitwise operation; the enum 'NpgsqlDbType' is not marked with 'Flags' attribute. (https://rules.sonarsource.com/csharp/RSPEC-3265)
{ "_includeElements", NpgsqlDbType.Boolean },
{ "_instanceOwner_partyId", NpgsqlDbType.Integer },
{ "_instanceOwner_partyIds", NpgsqlDbType.Integer | NpgsqlDbType.Array },

Check warning on line 556 in src/Storage/Repository/PgInstanceRepository.cs

View workflow job for this annotation

GitHub Actions / Build, test & analyze 

Remove this bitwise operation; the enum 'NpgsqlDbType' is not marked with 'Flags' attribute. (https://rules.sonarsource.com/csharp/RSPEC-3265)
{ "_lastChanged_eq", NpgsqlDbType.TimestampTz },
{ "_lastChanged_gt", NpgsqlDbType.TimestampTz },
{ "_lastChanged_gte", NpgsqlDbType.TimestampTz },
Expand Down
Loading
Loading