feat: can add and see billings #298

backend/src/mongodb/billing.go

@@ -93,10 +93,6 @@ func (cbd *CreateBillingData) ParseBody(body io.Reader) error {
 		return errors.New("invalid emission time")
 	}
 
-	if cbd.Notes == nil {
-		return errors.New("invalid notes")
-	}
-
 	if cbd.Event == nil {
 		return errors.New("invalid event")
 	}
@@ -271,16 +267,16 @@ func (b *BillingsType) DeleteBilling(id primitive.ObjectID) (*models.Billing, er
 
 	billing, err := b.GetBilling(id)
 	if err != nil {
-		return nil, err
+		return billing, err
 	}
 
 	deleteResult, err := b.Collection.DeleteOne(ctx, bson.M{"_id": id})
 	if err != nil {
-		return nil, err
+		return billing, err
 	}
 
 	if deleteResult.DeletedCount != 1 {
-		return nil, fmt.Errorf("should have deleted 1 billing, deleted %v", deleteResult.DeletedCount)
+		return billing, fmt.Errorf("should have deleted 1 billing, deleted %v", deleteResult.DeletedCount)
 	}
 
 	return billing, nil

backend/src/mongodb/company.go

@@ -1156,14 +1156,9 @@ func (c *CompaniesType) UpdatePackage(companyID primitive.ObjectID, packageID pr
 
 // UpdateBilling updates the billing of a company's participation related to the current event.
 // Uses a models.Billing ID to store this information.
-func (c *CompaniesType) UpdateBilling(companyID primitive.ObjectID, billingID primitive.ObjectID) (*models.Company, error) {
+func (c *CompaniesType) UpdateBilling(companyID primitive.ObjectID, billingID primitive.ObjectID, event int) (*models.Company, error) {
 
 	ctx := context.Background()
-	currentEvent, err := Events.GetCurrentEvent()
-
-	if err != nil {
-		return nil, err
-	}
 
 	var updatedCompany models.Company
 
@@ -1173,7 +1168,7 @@ func (c *CompaniesType) UpdateBilling(companyID primitive.ObjectID, billingID pr
 		},
 	}
 
-	var filterQuery = bson.M{"_id": companyID, "participations.event": currentEvent.ID}
+	var filterQuery = bson.M{"_id": companyID, "participations.event": event}
 
 	var optionsQuery = options.FindOneAndUpdate()
 	optionsQuery.SetReturnDocument(options.After)

backend/src/router/company.go

@@ -562,7 +562,7 @@ func addCompanyParticipationBilling(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	updatedCompany, err := mongodb.Companies.UpdateBilling(companyID, newBilling.ID)
+	updatedCompany, err := mongodb.Companies.UpdateBilling(companyID, newBilling.ID, newBilling.Event)
 	if err != nil {
 		http.Error(w, "Could not update company's billing", http.StatusExpectationFailed)
 
@@ -604,7 +604,7 @@ func deleteCompanyParticipationBilling(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, err = mongodb.Billings.DeleteBilling(billingID)
+	bill, err := mongodb.Billings.DeleteBilling(billingID)
 	if err != nil {
 		http.Error(w, "Billing not found"+err.Error(), http.StatusNotFound)
 		return
@@ -618,7 +618,7 @@ func deleteCompanyParticipationBilling(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// create deleted billing
-		if _, err := mongodb.Companies.UpdateBilling(companyID, billingID); err != nil {
+		if _, err := mongodb.Companies.UpdateBilling(companyID, billingID, bill.Event); err != nil {
 			log.Printf("error adding billing to company participation: %s\n", err.Error())
 		}
 

backend/src/router/company_test.go

@@ -896,7 +896,7 @@ func TestAddCompanyPackage(t *testing.T) {
 
 	var packageID = updatedCompany.Participations[0].Package
 
-	createdPackage, err := mongodb.Packages.GetPackage(packageID)
+	createdPackage, err := mongodb.Packages.GetPackage(*packageID)
 	assert.NilError(t, err)
 
 	assert.Equal(t, createdPackage.Name, name)

frontend/lib/models/billing.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:intl/intl.dart';
+
 class BillingStatus {
   final bool proForma;
   final bool invoice;
@@ -64,7 +66,7 @@ class Billing {
       company: json['company'],
       value: json['value'],
       invoiceNumber: json['invoiceNumber'],
-      emission: DateTime(json['emission']),
+      emission: DateTime.parse(json['emission']),
       notes: json['notes'],
       visible: json['visible'],
     );
@@ -84,6 +86,17 @@ class Billing {
 
   @override
   String toString() {
-    return json.encode(this.toJson());
+    String repr = "";
+    Map<String, dynamic> bill = this.toJson();
+    bill.forEach((key, value) {
+      repr += key + ' ';
+      if (value != DateTime) {
+        repr += value.toString();
+      } else {
+        repr += DateFormat('yyyy-MM-dd HH:mm').format(value);
+      }
+      repr += '\n';
+    });
+    return repr;
   }
 }

frontend/lib/routes/company/CompanyScreen.dart

@@ -4,6 +4,7 @@ import 'package:frontend/components/appbar.dart';
 import 'package:frontend/components/eventNotifier.dart';
 import 'package:frontend/components/threads/participations/communicationsList.dart';
 import 'package:frontend/models/company.dart';
+import 'package:frontend/routes/company/billing/AddBillingForm.dart';
 import 'package:frontend/routes/company/billing/BillingScreen.dart';
 import 'package:frontend/routes/company/CompanyTableNotifier.dart';
 import 'package:frontend/routes/company/DetailsScreen.dart';
@@ -98,8 +99,22 @@ class _CompanyScreenState extends State<CompanyScreen>
     int index = _tabController.index;
     switch (index) {
       case 0:
-      case 1:
         return null;
+      case 1:
+        return FloatingActionButton.extended(
+          onPressed: () {
+            Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => AddBillingForm(
+                        id: widget.company.id,
+                        onEditCompany: (context, _company) {
+                          companyChangedCallback(context, company: _company);
+                        })));
+          },
+          label: const Text('Add new Billing'),
+          icon: const Icon(Icons.add),
+        );
       case 2:
         {
           if (widget.company.lastParticipation != latestEvent) {