From f62fc1ce388a00a728785053c8492bd42b4a321f Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 10 Dec 2017 17:50:20 +0100 Subject: [PATCH] Db0068: Killing salary payouts --- Database/Configuration.cs | 2 +- Database/Database-Salaries.cs | 24 +++++++++++++++---- Database/Schemata/revisions.txt | 5 ++-- Database/Schemata/upgrade-0068.sql | 16 +++++++++++++ Logic/Financial/Salary.cs | 37 ++++++++++++++++++++++++++---- 5 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 Database/Schemata/upgrade-0068.sql diff --git a/Database/Configuration.cs b/Database/Configuration.cs index 8a9e5078..6fe03908 100644 --- a/Database/Configuration.cs +++ b/Database/Configuration.cs @@ -12,7 +12,7 @@ namespace Swarmops.Database /// /// This is the IN-CODE revision of the database. The version we expect to be running against. /// - public static int DbVersionExpected => 67; + public static int DbVersionExpected => 68; // This class is in horrible need of serious refactoring. For its simplicity in task, it's a horrible bowl of spaghetti. diff --git a/Database/Database-Salaries.cs b/Database/Database-Salaries.cs index 0246e964..4c627216 100644 --- a/Database/Database-Salaries.cs +++ b/Database/Database-Salaries.cs @@ -184,17 +184,33 @@ namespace Swarmops.Database } - public void SetSalaryAttested (int salaryId, bool attested) + public void SetSalaryAttested(int salaryId, bool attested) { using (DbConnection connection = GetMySqlDbConnection()) { connection.Open(); - DbCommand command = GetDbCommand ("SetSalaryAttested", connection); + DbCommand command = GetDbCommand("SetSalaryAttested", connection); command.CommandType = CommandType.StoredProcedure; - AddParameterWithName (command, "salaryId", salaryId); - AddParameterWithName (command, "attested", attested); + AddParameterWithName(command, "salaryId", salaryId); + AddParameterWithName(command, "attested", attested); + + command.ExecuteNonQuery(); + } + } + + public void SetSalaryOpen(int salaryId, bool attested) + { + using (DbConnection connection = GetMySqlDbConnection()) + { + connection.Open(); + + DbCommand command = GetDbCommand("SetSalaryOpen", connection); + command.CommandType = CommandType.StoredProcedure; + + AddParameterWithName(command, "salaryId", salaryId); + AddParameterWithName(command, "open", attested); command.ExecuteNonQuery(); } diff --git a/Database/Schemata/revisions.txt b/Database/Schemata/revisions.txt index 058e732a..52df7730 100644 --- a/Database/Schemata/revisions.txt +++ b/Database/Schemata/revisions.txt @@ -63,5 +63,6 @@ 0063 - Added DeriveUnique to HotBitcoinAddresses for ability to create unique HBAs [RF] 0064 - Quick fix for OutboundInvoices (how did this error happen?) [RF] 0065 - Dumb fix for 0062 (or rather, the error was dumb) [RF] -0066 - Added OrganizationSequenceId to CashAdvances, ExpenseClaims -0067 - Bugfix for 0066 +0066 - Added OrganizationSequenceId to CashAdvances, ExpenseClaims [RF] +0067 - Bugfix for 0066 [RF] +0068 - Added SetSalaryOpen [RF] diff --git a/Database/Schemata/upgrade-0068.sql b/Database/Schemata/upgrade-0068.sql new file mode 100644 index 00000000..1d0b7052 --- /dev/null +++ b/Database/Schemata/upgrade-0068.sql @@ -0,0 +1,16 @@ +DROP PROCEDURE IF EXISTS `SetSalaryOpen` + + +# + + +CREATE PROCEDURE `SetSalaryOpen`( + IN salaryId INTEGER, + IN open BOOLEAN +) +BEGIN + + UPDATE Salaries SET Salaries.Open=open + WHERE Salaries.SalaryId=salaryId; + +END diff --git a/Logic/Financial/Salary.cs b/Logic/Financial/Salary.cs index ed19cae3..693be944 100644 --- a/Logic/Financial/Salary.cs +++ b/Logic/Financial/Salary.cs @@ -125,26 +125,55 @@ namespace Swarmops.Logic.Financial } } + + public bool Open + { + get { return base.Open; } + set + { + if (base.Open != value) + { + SwarmDb.GetDatabaseForWriting().SetSalaryOpen(Identity, value); + base.Open = value; + } + } + } + + + public bool Attested + { + get { return base.Attested; } + set + { + if (base.Attested != value) + { + SwarmDb.GetDatabaseForWriting().SetSalaryAttested(Identity, value); + base.Attested = value; + } + } + } + + #region IAttestable Members public void Attest (Person attester) { SwarmDb.GetDatabaseForWriting().CreateFinancialValidation (FinancialValidationType.Attestation, FinancialDependencyType.Salary, Identity, DateTime.Now, attester.Identity, CostTotalCents/100.0); - SwarmDb.GetDatabaseForWriting().SetSalaryAttested (Identity, true); + this.Attested = true; } public void Deattest (Person deattester) { SwarmDb.GetDatabaseForWriting().CreateFinancialValidation (FinancialValidationType.Deattestation, FinancialDependencyType.Salary, Identity, DateTime.Now, deattester.Identity, CostTotalCents/100.0); - SwarmDb.GetDatabaseForWriting().SetSalaryAttested (Identity, false); + this.Attested = false; } public void DenyAttestation (Person denyingPerson, string reason) { - Attested = false; - Open = false; + this.Attested = false; + this.Open = false; SwarmDb.GetDatabaseForWriting().CreateFinancialValidation(FinancialValidationType.Kill, FinancialDependencyType.ExpenseClaim, Identity,