add helper for (re)sending a single invoice

4 files changed, 194 insertions, 37 deletions

diff --git a/src/invoice/.gitignore b/src/invoice/.gitignore
index 7079d00..0d4d46e 100644
--- a/src/invoice/.gitignore
+++ b/src/invoice/.gitignore
@@ -1 +1,2 @@
 invoice
+single-invoice
diff --git a/src/invoice/Makefile b/src/invoice/Makefile
index 37c4e52..9cbee33 100644
--- a/src/invoice/Makefile
+++ b/src/invoice/Makefile
@@ -1,9 +1,12 @@
-all: invoice
+all: invoice single-invoice
 
 invoice: main.vala invoice.vala ../mail/mailer-interface.vala ../pdf-invoice/pdf-invoice-interface.vala ../database/db-interface.vala ../config/config-interface.vala ../price.vapi
 	valac -X -w -o $@ --pkg gio-2.0 $^
 
+single-invoice: single.vala invoice.vala ../mail/mailer-interface.vala ../pdf-invoice/pdf-invoice-interface.vala ../database/db-interface.vala ../config/config-interface.vala ../price.vapi
+	valac -X -w -o $@ --pkg gio-2.0 $^
+
 clean:
-	rm -f invoice
+	rm -f invoice single-invoice
 
 .PHONY: all clean
diff --git a/src/invoice/invoice.vala b/src/invoice/invoice.vala
index 41fa12b..ac2637c 100644
--- a/src/invoice/invoice.vala
+++ b/src/invoice/invoice.vala
@@ -20,6 +20,13 @@ public struct Timespan {
 	int64 to;
 }
 
+public struct InvoiceData {
+	string pdffilename;
+	uint8[] pdfdata;
+	string plain;
+	string html;
+}
+
 public class InvoiceImplementation {
 	Mailer mailer;
 	Database db;
@@ -34,12 +41,79 @@ public class InvoiceImplementation {
 		datadir = cfg.get_string("INVOICE", "datadir");
 	}
 
-	public void send_invoices(bool temporary, int64 timestamp) throws IOError, InvoicePDFError, DatabaseError {
+	public void send_invoice(bool temporary, int64 timestamp, int user) throws IOError, InvoicePDFError, DatabaseError {
 		int64 prevtimestamp = timestamp - day_in_seconds;
 
-		if(!temporary) {
+		if(!temporary)
 			prevtimestamp = new DateTime.from_unix_local(timestamp).add_months(-1).to_unix();
+
+		Timespan ts = get_timespan(temporary, prevtimestamp);
+		Timespan tst = get_timespan(false, prevtimestamp);
+		int number = 0;
+
+
+		var start = new DateTime.from_unix_local(ts.from);
+		var stop  = new DateTime.from_unix_local(ts.to);
+		var startstring = start.format("%d.%m.%Y %H:%M:%S");
+		var stopstring  = stop.format("%d.%m.%Y %H:%M:%S");
+
+		/* title */
+		string mailtitle = temporary ? "Getränkezwischenstand" : "Getränkerechnung";
+		mailtitle += @" $startstring - $stopstring";
+
+		stdout.printf(mailtitle + "\n\n");
+
+		var users = db.get_users_with_sales(ts.from, ts.to);
+
+		string treasurer_path  = mailer.create_mail();
+		Mail treasurer_mail    = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", treasurer_path);
+		treasurer_mail.from    = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
+		treasurer_mail.subject = mailtitle;
+		treasurer_mail.add_recipient({"Schatzmeister", "schatzmeister@kreativitaet-trifft-technik.de"}, RecipientType.TO);
+		var csvinvoicedata     = "";
+
+		foreach(var userid in users) {
+			number++;
+			string invoiceid = "SH" + start.format("%Y%m") + "5" + "%03d".printf(number);
+			var userdata = db.get_user_info(userid);
+			var total_sum = db.get_user_invoice_sum(userid, tst.from, tst.to);
+
+			if(userid == user) {
+				var invoicedata = generate_invoice(temporary, timestamp, userid, invoiceid);
+				string mail_path = mailer.create_mail();
+				Mail mail = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", mail_path);
+				mail.from = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
+				mail.subject = mailtitle;
+				mail.add_recipient({@"$(userdata.firstname) $(userdata.lastname)", userdata.email}, RecipientType.TO);
+
+				if(!temporary) {
+					mail.add_attachment(invoicedata.pdffilename, "application/pdf", invoicedata.pdfdata);
+					treasurer_mail.add_attachment(invoicedata.pdffilename, "application/pdf", invoicedata.pdfdata);
+				}
+
+				mail.set_main_part(invoicedata.plain, MessageType.PLAIN);
+				mail.set_main_part(invoicedata.html, MessageType.HTML);
+
+				mailer.send_mail(mail_path);
+			}
+
+			if(!temporary) {
+				csvinvoicedata += @"$(userdata.id),$(userdata.lastname),$(userdata.firstname),$invoiceid,$total_sum\n";
+			}
+		}
+
+		if(!temporary) {
+			treasurer_mail.set_main_part(get_treasurer_text(), MessageType.PLAIN);
+			treasurer_mail.add_attachment("invoice.csv", "text/csv; charset=utf-8", csvinvoicedata.data);
+			mailer.send_mail(treasurer_path);
 		}
+	}
+
+	public void send_invoices(bool temporary, int64 timestamp) throws IOError, InvoicePDFError, DatabaseError {
+		int64 prevtimestamp = timestamp - day_in_seconds;
+
+		if(!temporary)
+			prevtimestamp = new DateTime.from_unix_local(timestamp).add_months(-1).to_unix();
 
 		Timespan ts = get_timespan(temporary, prevtimestamp);
 		Timespan tst = get_timespan(false, prevtimestamp);
@@ -67,18 +141,59 @@ public class InvoiceImplementation {
 		var csvinvoicedata     = "";
 
 		foreach(var userid in users) {
-			uint8[] pdfdata = null;
+			number++;
+			string invoiceid = "SH" + start.format("%Y%m") + "5" + "%03d".printf(number);
+			var invoicedata = generate_invoice(temporary, timestamp, userid, invoiceid);
+			var userdata = db.get_user_info(userid);
+			var total_sum = db.get_user_invoice_sum(userid, tst.from, tst.to);
+
+			string mail_path = mailer.create_mail();
+			Mail mail = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", mail_path);
+			mail.from = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
+			mail.subject = mailtitle;
+			mail.add_recipient({@"$(userdata.firstname) $(userdata.lastname)", userdata.email}, RecipientType.TO);
+
+			if(!temporary)
+				mail.add_attachment(invoicedata.pdffilename, "application/pdf", invoicedata.pdfdata);
+
+			mail.set_main_part(invoicedata.plain, MessageType.PLAIN);
+
+			mail.set_main_part(invoicedata.html, MessageType.HTML);
+
+			mailer.send_mail(mail_path);
+
+			if(!temporary) {
+				treasurer_mail.add_attachment(invoicedata.pdffilename, "application/pdf", invoicedata.pdfdata);
+				csvinvoicedata += @"$(userdata.id),$(userdata.lastname),$(userdata.firstname),$invoiceid,$total_sum\n";
+			}
+		}
+
+		if(!temporary) {
+			treasurer_mail.set_main_part(get_treasurer_text(), MessageType.PLAIN);
+			treasurer_mail.add_attachment("invoice.csv", "text/csv; charset=utf-8", csvinvoicedata.data);
+			mailer.send_mail(treasurer_path);
+		}
+	}
+
+	public InvoiceData generate_invoice(bool temporary, int64 timestamp, int userid, string invoiceid) throws IOError, InvoicePDFError, DatabaseError {
+			int64 prevtimestamp = timestamp - day_in_seconds;
+			if(!temporary)
+				prevtimestamp = new DateTime.from_unix_local(timestamp).add_months(-1).to_unix();
+
 			var userdata = db.get_user_info(userid);
 
+			InvoiceData result = InvoiceData();
+
 			stdout.printf("%d (%s %s)...\n", userdata.id, userdata.firstname, userdata.lastname);
 
+			Timespan ts = get_timespan(temporary, prevtimestamp);
+			Timespan tst = get_timespan(false, prevtimestamp);
+
 			var invoiceentries = db.get_invoice(userid, ts.from, ts.to);
 			var total_sum = db.get_user_invoice_sum(userid, tst.from, tst.to);
 
 			/* invoice id */
-			number++;
-			string invoiceid = "SH" + start.format("%Y%m") + "5" + "%03d".printf(number);
-			string pdffilename = invoiceid + @"_$(userdata.firstname)_$(userdata.lastname).pdf";
+			result.pdffilename = invoiceid + @"_$(userdata.firstname)_$(userdata.lastname).pdf";
 
 			/* pdf generation */
 			if(!temporary) {
@@ -94,42 +209,17 @@ public class InvoiceImplementation {
 						userdata.gender
 					};
 					pdf.invoice_entries = invoiceentries;
-					pdfdata = pdf.generate();
+					result.pdfdata = pdf.generate();
 					pdf.clear();
 				} catch(DBusError e) {
 					throw new IOError.FAILED("PDF Generation failed");
 				}
 			}
 
-			string mail_path = mailer.create_mail();
-			Mail mail = Bus.get_proxy_sync(BusType.SESSION, "io.mainframe.shopsystem.Mail", mail_path);
-			mail.from = {"KtT Shopsystem", "shop@kreativitaet-trifft-technik.de"};
-			mail.subject = mailtitle;
-			mail.add_recipient({@"$(userdata.firstname) $(userdata.lastname)", userdata.email}, RecipientType.TO);
-
-			if(!temporary) {
-				mail.add_attachment(pdffilename, "application/pdf", pdfdata);
-			}
-
-			var plain = generate_invoice_message(MessageType.PLAIN, temporary, get_address(userdata.gender), userdata.lastname, invoiceentries, total_sum);
-			mail.set_main_part(plain, MessageType.PLAIN);
+			result.plain = generate_invoice_message(MessageType.PLAIN, temporary, get_address(userdata.gender), userdata.lastname, invoiceentries, total_sum);
+			result.html = generate_invoice_message(MessageType.HTML, temporary, get_address(userdata.gender), userdata.lastname, invoiceentries, total_sum);
 
-			var html = generate_invoice_message(MessageType.HTML, temporary, get_address(userdata.gender), userdata.lastname, invoiceentries, total_sum);
-			mail.set_main_part(html, MessageType.HTML);
-
-			mailer.send_mail(mail_path);
-
-			if(!temporary) {
-				treasurer_mail.add_attachment(pdffilename, "application/pdf", pdfdata);
-				csvinvoicedata += @"$(userdata.id),$(userdata.lastname),$(userdata.firstname),$invoiceid,$total_sum\n";
-			}
-		}
-
-		if(!temporary) {
-			treasurer_mail.set_main_part(get_treasurer_text(), MessageType.PLAIN);
-			treasurer_mail.add_attachment("invoice.csv", "text/csv; charset=utf-8", csvinvoicedata.data);
-			mailer.send_mail(treasurer_path);
-		}
+			return result;
 	}
 
 	private string get_treasurer_text() throws IOError {
diff --git a/src/invoice/single.vala b/src/invoice/single.vala
new file mode 100644
index 0000000..54cba26
--- /dev/null
+++ b/src/invoice/single.vala
@@ -0,0 +1,63 @@
+/* Copyright 2013, Sebastian Reichel <sre@ring0.de>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+InvoiceImplementation invoice;
+
+public static void help(string name) {
+	stderr.printf("Usage: %s <temporary> <user> [timestamp]\n", name);
+	stderr.printf("Possible values for <temporary>: temporary, final\n");
+}
+
+public static int main(string[] args) {
+	bool temporary = false;
+	int64 timestamp = new DateTime.now_local().to_unix();
+	int user = 0;
+
+	if(args.length < 3) {
+		help(args[0]);
+		return 1;
+	}
+
+	if(args[1] == "temporary") {
+		temporary = true;
+	} else if(args[1] == "final") {
+		temporary = false;
+	} else {
+		help(args[0]);
+		return 1;
+	}
+
+	user = int.parse(args[2]);
+
+	if(args.length >= 4) {
+		timestamp = int64.parse(args[3]);
+	}
+
+	try {
+		invoice = new InvoiceImplementation();
+	} catch(Error e) {
+		stderr.printf("Error: %s\n", e.message);
+		return 1;
+	}
+
+	try {
+		invoice.send_invoice(temporary, timestamp, user);
+	} catch(Error e) {
+		stderr.printf("Error: %s\n", e.message);
+		return 1;
+	}
+
+	return 0;
+}