Renaming

cancel.go

@@ -29,7 +29,7 @@ func (c *Client) GenerateCancel(env *gobl.Envelope) (*doc.VeriFactu, error) {
 	}
 
 	// Create the document
-	cd, err := doc.NewDocument(inv, ts, c.issuerRole, c.software, true)
+	cd, err := doc.NewVerifactu(inv, ts, c.issuerRole, c.software, true)
 	if err != nil {
 		return nil, err
 	}
@@ -38,9 +38,7 @@ func (c *Client) GenerateCancel(env *gobl.Envelope) (*doc.VeriFactu, error) {
 }
 
 // FingerprintCancel generates a fingerprint for the cancellation document using the
-// data provided from the previous chain data. If there was no previous
-// document in the chain, the parameter should be nil. The document is updated
-// in place.
+// data provided from the previous chain data. The document is updated in place.
 func (c *Client) FingerprintCancel(d *doc.VeriFactu, prev *doc.ChainData) error {
 	return d.FingerprintCancel(prev)
 }

cmd/gobl.verifactu/cancel.go

@@ -67,7 +67,7 @@ func (c *cancelOpts) runE(cmd *cobra.Command, args []string) error {
 	if c.production {
 		opts = append(opts, verifactu.InProduction())
 	} else {
-		opts = append(opts, verifactu.InTesting())
+		opts = append(opts, verifactu.InSandbox())
 	}
 
 	tc, err := verifactu.New(c.software(), opts...)

cmd/gobl.verifactu/root.go

@@ -35,7 +35,6 @@ func (o *rootOpts) cmd() *cobra.Command {
 
 	cmd.AddCommand(versionCmd())
 	cmd.AddCommand(send(o).cmd())
-	cmd.AddCommand(sendTest(o).cmd())
 	cmd.AddCommand(convert(o).cmd())
 	cmd.AddCommand(cancel(o).cmd())
 
@@ -64,7 +63,7 @@ func (o *rootOpts) software() *doc.Software {
 		NombreSistemaInformatico:    o.swName,
 		TipoUsoPosibleSoloVerifactu: "S",
 		TipoUsoPosibleMultiOT:       "S",
-		IndicadorMultiplesOT:        "S",
+		IndicadorMultiplesOT:        "N",
 	}
 }
 

cmd/gobl.verifactu/send.go

@@ -9,6 +9,7 @@ import (
 	"github.com/invopop/gobl"
 	verifactu "github.com/invopop/gobl.verifactu"
 	"github.com/invopop/gobl.verifactu/doc"
+	"github.com/invopop/xmldsig"
 	"github.com/spf13/cobra"
 )
 
@@ -53,14 +54,19 @@ func (c *sendOpts) runE(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("unmarshaling gobl envelope: %w", err)
 	}
 
+	cert, err := xmldsig.LoadCertificate(c.cert, c.password)
+	if err != nil {
+		return err
+	}
+
 	opts := []verifactu.Option{
-		verifactu.WithThirdPartyIssuer(),
+		verifactu.WithCertificate(cert),
 	}
 
 	if c.production {
 		opts = append(opts, verifactu.InProduction())
 	} else {
-		opts = append(opts, verifactu.InTesting())
+		opts = append(opts, verifactu.InSandbox())
 	}
 
 	tc, err := verifactu.New(c.software(), opts...)

doc/breakdown_test.go

@@ -20,7 +20,7 @@ func TestBreakdownConversion(t *testing.T) {
 	t.Run("basic-invoice", func(t *testing.T) {
 		inv := test.LoadInvoice("inv-base.json")
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 
 		assert.Equal(t, 1800.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
@@ -50,7 +50,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 		assert.Equal(t, 100.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
 		assert.Equal(t, "01", d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].Impuesto)
@@ -92,7 +92,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 		assert.Equal(t, 100.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
 		assert.Equal(t, 21.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].CuotaRepercutida)
@@ -125,7 +125,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 		assert.Equal(t, 100.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
 		assert.Equal(t, 0.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].CuotaRepercutida)
@@ -151,7 +151,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		_, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		_, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.Error(t, err)
 	})
 
@@ -175,7 +175,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 		assert.Equal(t, 100.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
 		assert.Equal(t, 21.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].CuotaRepercutida)
@@ -206,7 +206,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 		assert.Equal(t, 100.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
 		assert.Equal(t, 10.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].CuotaRepercutida)
@@ -236,7 +236,7 @@ func TestBreakdownConversion(t *testing.T) {
 			},
 		}
 		_ = inv.Calculate()
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, false)
 		require.NoError(t, err)
 		assert.Equal(t, 1000.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].BaseImponibleOImporteNoSujeto)
 		assert.Equal(t, 100.00, d.RegistroFactura.RegistroAlta.Desglose.DetalleDesglose[0].CuotaRepercutida)

doc/cancel_test.go

@@ -15,7 +15,7 @@ func TestNewRegistroAnulacion(t *testing.T) {
 	t.Run("basic", func(t *testing.T) {
 		inv := test.LoadInvoice("cred-note-base.json")
 
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleSupplier, nil, true)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleSupplier, nil, true)
 		require.NoError(t, err)
 
 		reg := d.RegistroFactura.RegistroAnulacion
@@ -33,7 +33,7 @@ func TestNewRegistroAnulacion(t *testing.T) {
 	t.Run("customer issuer", func(t *testing.T) {
 		inv := test.LoadInvoice("cred-note-base.json")
 
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleCustomer, nil, true)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleCustomer, nil, true)
 		require.NoError(t, err)
 
 		reg := d.RegistroFactura.RegistroAnulacion
@@ -51,7 +51,7 @@ func TestNewRegistroAnulacion(t *testing.T) {
 	t.Run("third party issuer", func(t *testing.T) {
 		inv := test.LoadInvoice("cred-note-base.json")
 
-		d, err := doc.NewDocument(inv, time.Now(), doc.IssuerRoleThirdParty, nil, true)
+		d, err := doc.NewVerifactu(inv, time.Now(), doc.IssuerRoleThirdParty, nil, true)
 		require.NoError(t, err)
 
 		reg := d.RegistroFactura.RegistroAnulacion

doc/doc.go

@@ -52,8 +52,8 @@ func init() {
 	}
 }
 
-// NewDocument creates a new VeriFactu document
-func NewDocument(inv *bill.Invoice, ts time.Time, r IssuerRole, s *Software, c bool) (*VeriFactu, error) {
+// NewVerifactu creates a new VeriFactu document
+func NewVerifactu(inv *bill.Invoice, ts time.Time, r IssuerRole, s *Software, c bool) (*VeriFactu, error) {
 	doc := &VeriFactu{
 		Cabecera: &Cabecera{
 			Obligado: Obligado{

doc/doc_test.go

@@ -18,7 +18,7 @@ func TestInvoiceConversion(t *testing.T) {
 
 	t.Run("should contain basic document info", func(t *testing.T) {
 		inv := test.LoadInvoice("inv-base.json")
-		doc, err := doc.NewDocument(inv, ts, role, sw, false)
+		doc, err := doc.NewVerifactu(inv, ts, role, sw, false)
 
 		require.NoError(t, err)
 		assert.Equal(t, "Invopop S.L.", doc.Cabecera.Obligado.NombreRazon)

doc/invoice_test.go

@@ -22,7 +22,7 @@ func TestNewRegistroAlta(t *testing.T) {
 
 	t.Run("should contain basic document info", func(t *testing.T) {
 		inv := test.LoadInvoice("inv-base.json")
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		reg := d.RegistroFactura.RegistroAlta
@@ -55,7 +55,7 @@ func TestNewRegistroAlta(t *testing.T) {
 		inv.SetTags(tax.TagSimplified)
 		inv.Customer = nil
 
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		assert.Equal(t, "S", d.RegistroFactura.RegistroAlta.FacturaSinIdentifDestinatarioArt61d)
@@ -64,7 +64,7 @@ func TestNewRegistroAlta(t *testing.T) {
 	t.Run("should handle rectificative invoices", func(t *testing.T) {
 		inv := test.LoadInvoice("cred-note-base.json")
 
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		reg := d.RegistroFactura.RegistroAlta
@@ -89,7 +89,7 @@ func TestNewRegistroAlta(t *testing.T) {
 			},
 		}
 
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		reg := d.RegistroFactura.RegistroAlta

doc/party_test.go

@@ -19,7 +19,7 @@ func TestNewParty(t *testing.T) {
 	sw := &doc.Software{}
 	t.Run("with tax ID", func(t *testing.T) {
 		inv := test.LoadInvoice("inv-base.json")
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		p := d.RegistroFactura.RegistroAlta.Destinatarios[0].IDDestinatario
@@ -40,7 +40,7 @@ func TestNewParty(t *testing.T) {
 			},
 		}
 
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		p := d.RegistroFactura.RegistroAlta.Destinatarios[0].IDDestinatario
@@ -61,7 +61,7 @@ func TestNewParty(t *testing.T) {
 			},
 		}
 
-		d, err := doc.NewDocument(inv, ts, role, sw, false)
+		d, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.NoError(t, err)
 
 		p := d.RegistroFactura.RegistroAlta.Destinatarios[0].IDDestinatario
@@ -79,7 +79,7 @@ func TestNewParty(t *testing.T) {
 			Name: "Simple Company",
 		}
 
-		_, err := doc.NewDocument(inv, ts, role, sw, false)
+		_, err := doc.NewVerifactu(inv, ts, role, sw, false)
 		require.Error(t, err)
 	})
 }