Extract common types into package

Author: twoGiants

refactoring/theatre/createStatementData.go

@@ -1,20 +1,21 @@
 package theatre
 
 import (
+	"dsa/refactoring/theatre/types"
 	"fmt"
 	"math"
 )
 
-type Plays map[string]Play
+type Plays map[string]types.Play
 
-func (p Plays) PlayFor(aPerformance Performance) Play {
+func (p Plays) PlayFor(aPerformance types.Performance) types.Play {
 	return p[aPerformance.PlayID]
 }
 
 type EnrichedPerformance struct {
 	Audience      int
 	Amount        int
-	Play          Play
+	Play          types.Play
 	playID        string
 	volumeCredits int
 }
@@ -24,7 +25,10 @@ type StatementData struct {
 	Performances []EnrichedPerformance
 }
 
-func CreateStatementData(invoice Invoice, plays map[string]Play) (StatementData, error) {
+func CreateStatementData(
+	invoice types.Invoice,
+	plays map[string]types.Play,
+) (StatementData, error) {
 	result := StatementData{}
 	result.Customer = invoice.Customer
 
@@ -42,7 +46,7 @@ func CreateStatementData(invoice Invoice, plays map[string]Play) (StatementData,
 }
 
 func (StatementData) enrichPerformance(
-	performance Performance,
+	performance types.Performance,
 	plays Plays,
 ) (EnrichedPerformance, error) {
 	calculator, err := CreatePerformanceCalculator(performance, plays.PlayFor(performance))
@@ -79,19 +83,22 @@ func (s StatementData) TotalAmount() int {
 type PerformanceCalculator interface {
 	Amount() int
 	VolumeCredits() int
-	Play() Play
+	Play() types.Play
 }
 
 type PerformanceCalculatorImpl struct {
-	performance Performance
-	play        Play
+	performance types.Performance
+	play        types.Play
 }
 
-func NewPerformanceCalculator(pe Performance, pl Play) PerformanceCalculatorImpl {
+func NewPerformanceCalculator(pe types.Performance, pl types.Play) PerformanceCalculatorImpl {
 	return PerformanceCalculatorImpl{pe, pl}
 }
 
-func CreatePerformanceCalculator(pe Performance, pl Play) (PerformanceCalculator, error) {
+func CreatePerformanceCalculator(
+	pe types.Performance,
+	pl types.Play,
+) (PerformanceCalculator, error) {
 	switch pl.Type {
 	case "tragedy":
 		return TragedyCalculatorImpl{NewPerformanceCalculator(pe, pl)}, nil
@@ -102,7 +109,7 @@ func CreatePerformanceCalculator(pe Performance, pl Play) (PerformanceCalculator
 	}
 }
 
-func (p PerformanceCalculatorImpl) Play() Play {
+func (p PerformanceCalculatorImpl) Play() types.Play {
 	return p.play
 }
 

refactoring/theatre/statement.go

@@ -1,29 +1,18 @@
 package theatre
 
 import (
+	"dsa/refactoring/theatre/types"
 	"fmt"
 
 	"github.com/leekchan/accounting"
 )
 
-type Play struct {
-	Name string
-	Type string
-}
-
-type Invoice struct {
-	Customer     string
-	Performances []Performance
-}
-
-type Performance struct {
-	PlayID   string
-	Audience int
-}
-
 type StatementPrinter struct{}
 
-func (s StatementPrinter) Print(invoice Invoice, plays map[string]Play) (string, error) {
+func (s StatementPrinter) Print(
+	invoice types.Invoice,
+	plays map[string]types.Play,
+) (string, error) {
 	statementData, err := CreateStatementData(invoice, plays)
 	if err != nil {
 		return "", err
@@ -49,7 +38,10 @@ func renderPlainText(data StatementData) string {
 	return result
 }
 
-func (s StatementPrinter) HtmlPrint(invoice Invoice, plays map[string]Play) (string, error) {
+func (s StatementPrinter) HtmlPrint(
+	invoice types.Invoice,
+	plays map[string]types.Play,
+) (string, error) {
 	statementData, err := CreateStatementData(invoice, plays)
 	if err != nil {
 		return "", err

refactoring/theatre/statement_test.go

@@ -9,6 +9,7 @@ import (
 	approvals "github.com/approvals/go-approval-tests"
 
 	"dsa/refactoring/theatre"
+	"dsa/refactoring/theatre/types"
 )
 
 func TestMain(m *testing.M) {
@@ -31,13 +32,13 @@ func TestPrinterPrintByApproval(t *testing.T) {
 }
 
 func TestStatementWithNewPlayTypes(t *testing.T) {
-	plays := map[string]theatre.Play{
+	plays := map[string]types.Play{
 		"henry-v": {Name: "Henry V", Type: "history"},
 		"as-like": {Name: "As You Like It", Type: "pastoral"},
 	}
-	invoice := theatre.Invoice{
+	invoice := types.Invoice{
 		Customer: "BigCo",
-		Performances: []theatre.Performance{
+		Performances: []types.Performance{
 			{PlayID: "henry-v", Audience: 53},
 			{PlayID: "as-like", Audience: 55},
 		},
@@ -50,7 +51,7 @@ func TestStatementWithNewPlayTypes(t *testing.T) {
 	}
 }
 
-func createTestData(t testing.TB, r io.Reader) (theatre.Invoice, map[string]theatre.Play) {
+func createTestData(t testing.TB, r io.Reader) (types.Invoice, map[string]types.Play) {
 	var in struct {
 		Plays []struct {
 			ID   string
@@ -59,14 +60,14 @@ func createTestData(t testing.TB, r io.Reader) (theatre.Invoice, map[string]thea
 				Type string
 			}
 		}
-		Invoice theatre.Invoice
+		Invoice types.Invoice
 	}
 
 	if err := json.NewDecoder(r).Decode(&in); err != nil {
 		t.Fatalf("failed to decode input data: %v", err)
 	}
 
-	plays := make(map[string]theatre.Play)
+	plays := make(map[string]types.Play)
 	for _, identifiedPlay := range in.Plays {
 		plays[identifiedPlay.ID] = identifiedPlay.Play
 	}

refactoring/theatre/types/types.go

@@ -0,0 +1,16 @@
+package types
+
+type Play struct {
+	Name string
+	Type string
+}
+
+type Invoice struct {
+	Customer     string
+	Performances []Performance
+}
+
+type Performance struct {
+	PlayID   string
+	Audience int
+}