More work on FinancialAccountDocument

This commit is contained in:
Rick Falkvinge
2018-12-31 05:45:19 +01:00
parent ac72f6bdf0
commit f221ddff03
5 changed files with 68 additions and 20 deletions
@@ -39,9 +39,13 @@ namespace Swarmops.Basic.Types.Financial
// empty copy ctor
}
// Identity field
[DbColumnName] [DbIdentity]
public int FinancialAccountDocumentId { get; private set; }
// Name-identical dbcolumns / properties
[DbColumnName] public int FinancialAccountDocumentId { get; private set; }
[DbColumnName] public int FinancialAccountId { get; private set; }
[DbColumnName] public DateTime UploadedDateTime { get; private set; }
[DbColumnName] public int UploadedByPersonId { get; private set; }
@@ -51,6 +55,7 @@ namespace Swarmops.Basic.Types.Financial
// Complex or renamed dbcolumns / properties
[DbColumnForeignTypeName("FinancialAccountDocumentTypes", "FinancialAccountDocumentTypeId", "Name")]
public FinancialAccountDocumentType Type { get; private set; }
+2
View File
@@ -40,8 +40,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Attributes\DbColumnTypeName.cs" />
<Compile Include="Attributes\DbEnumField.cs" />
<Compile Include="Attributes\DbColumnName.cs" />
<Compile Include="Attributes\DbIdentity.cs" />
<Compile Include="Attributes\DbRecordType.cs" />
<Compile Include="Constants.cs" />
<Compile Include="Enums\AddressValidationResult.cs" />
+21 -19
View File
@@ -13,30 +13,32 @@ namespace Swarmops.Database
#region Database field reading
private const string financialAccountDocumentFieldSequence =
" PaymentId,PaymentGroupId,AmountCents,Reference,FromAccount," + // 0-4
"PaymentKey,HasImage,OutboundInvoiceId " + // 5-7
"FROM Payments ";
" FinancialAccountDocumentId,FinancialAccountId,FinancialAccountDocumentTypes.Name,UploadedDateTime,UploadedByPersonId, " + // 0-4
" ConcernsPeriodStart,ConcernsPeriodEnd,RawDocumentText " + // 5-7
" FROM FinancialAccountDocuments JOIN FinancialAccountDocumentTypes USING (FinancialAccountDocumentTypeId) ";
private static BasicPayment ReadFinancialAccountDocumentFromDataReader(IDataRecord reader)
private static BasicFinancialAccountDocument ReadFinancialAccountDocumentFromDataReader(IDataRecord reader)
{
int paymentId = reader.GetInt32(0);
int paymentGroupId = reader.GetInt32(1);
Int64 amountCents = reader.GetInt64(2);
string reference = reader.GetString(3);
string fromAccount = reader.GetString(4);
string key = reader.GetString(5);
bool hasImage = reader.GetBoolean(6);
int outboundInvoiceId = reader.GetInt32(7);
int financialAccountDocumentId = reader.GetInt32(0);
int financialAccountId = reader.GetInt32(1);
string financialAccountDocumentTypeString = reader.GetString(2);
DateTime uploadedDateTime = reader.GetDateTime(3);
int uploadedByPersonId = reader.GetInt32(4);
DateTime concernsPeriodStart = reader.GetDateTime(5);
DateTime concernsPeriodEnd = reader.GetDateTime(6);
string rawText = reader.GetString(7);
return new BasicPayment(paymentId, paymentGroupId, amountCents, reference, fromAccount, key, hasImage,
outboundInvoiceId);
FinancialAccountDocumentType docType = (FinancialAccountDocumentType) Enum.Parse(typeof (FinancialAccountDocumentType), financialAccountDocumentTypeString);
return new BasicFinancialAccountDocument(financialAccountDocumentId, financialAccountId, docType, uploadedDateTime, uploadedByPersonId, concernsPeriodStart,
concernsPeriodEnd, rawText);
}
#endregion
#region Database record reading -- SELECT clauses
public BasicPayment GetFinancialAccountDocument(int financialAccountDocumentId)
public BasicFinancialAccountDocument GetFinancialAccountDocument(int financialAccountDocumentId)
{
using (DbConnection connection = GetMySqlDbConnection())
{
@@ -51,7 +53,7 @@ namespace Swarmops.Database
{
if (reader.Read())
{
return ReadPaymentFromDataReader(reader);
return ReadFinancialAccountDocumentFromDataReader(reader);
}
throw new ArgumentException("No such FinancialAccountDocumentId:" + financialAccountDocumentId);
@@ -60,9 +62,9 @@ namespace Swarmops.Database
}
public BasicPayment[] GetFinancialAccountDocuments(params object[] conditions)
public BasicFinancialAccountDocument[] GetFinancialAccountDocuments(params object[] conditions)
{
List<BasicPayment> result = new List<BasicPayment>();
List<BasicFinancialAccountDocument> result = new List<BasicFinancialAccountDocument>();
using (DbConnection connection = GetMySqlDbConnection())
{
@@ -76,7 +78,7 @@ namespace Swarmops.Database
{
while (reader.Read())
{
result.Add(ReadPaymentFromDataReader(reader));
result.Add(ReadFinancialAccountDocumentFromDataReader(reader));
}
return result.ToArray();
@@ -4,6 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Swarmops.Basic.Types.Financial;
using Swarmops.Common.Enums;
using Swarmops.Database;
using Swarmops.Logic.Swarm;
namespace Swarmops.Logic.Financial
{
@@ -14,5 +17,38 @@ namespace Swarmops.Logic.Financial
public FinancialAccountDocument()
{
}
private FinancialAccountDocument(BasicFinancialAccountDocument basic) : base(basic)
{
// private ctor
}
public static FinancialAccountDocument FromBasic(BasicFinancialAccountDocument basic)
{
return new FinancialAccountDocument(basic);
}
public static FinancialAccountDocument FromIdentity(int financialAccountDocumentId)
{
return FromBasic(SwarmDb.GetDatabaseForReading().GetFinancialAccountDocument(financialAccountDocumentId));
}
internal static FinancialAccountDocument FromIdentityAggressive(int financialAccountDocumentId)
{
return FromBasic(SwarmDb.GetDatabaseForWriting().GetFinancialAccountDocument(financialAccountDocumentId));
}
public static FinancialAccountDocument Create(FinancialAccount account, FinancialAccountDocumentType documentType, Person uploader, DateTime concernsStart, DateTime concernsEnd, string rawText)
{
return FromIdentityAggressive(
SwarmDb.GetDatabaseForWriting().CreateFinancialAccountDocument(
account.Identity,
documentType,
uploader == null? 0: uploader.Identity,
concernsStart,
concernsEnd,
rawText
));
}
}
}
+3
View File
@@ -5310,6 +5310,9 @@
<LastGenOutput>Pages.Swarm.yo-NG.designer.cs</LastGenOutput>
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="Frames\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>