From 0a7a3bf6b554d0cd3a1c3ff8859b5593d39a4007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman@kendu.si>
Date: Mon, 23 Mar 2020 17:56:11 +0100
Subject: [PATCH] Rework splitted stream header determination

---
 pkg/migrate/stream.go | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkg/migrate/stream.go b/pkg/migrate/stream.go
index 3dee6082c..26209dd8b 100644
--- a/pkg/migrate/stream.go
+++ b/pkg/migrate/stream.go
@@ -14,11 +14,12 @@ import (
 
 type (
 	SplitBuffer struct {
-		buffer *bytes.Buffer
-		name   string
-		row    []string
-		header []string
-		writer *csv.Writer
+		buffer    *bytes.Buffer
+		name      string
+		row       []string
+		header    []string
+		hasHeader bool
+		writer    *csv.Writer
 
 		// field: masterID: [value]
 		joins map[string]map[string][]string
@@ -64,12 +65,7 @@ func splitStream(m types.Migrateable) ([]types.Migrateable, error) {
 
 	// splitting magic
 
-	// @fix this hack will not always work.
-	// replace with a set or something similar
-	i := -1
 	for {
-		i++
-
 		record, err := r.Read()
 		if err == io.EOF {
 			break
@@ -79,6 +75,11 @@ func splitStream(m types.Migrateable) ([]types.Migrateable, error) {
 			return nil, err
 		}
 
+		// on next row, old stream's headers are finished
+		for _, b := range bufs {
+			b.hasHeader = true
+		}
+
 		// find first applicable map, that can be used for the given row.
 		// default maps should not inclide a where field
 		for _, strmp := range streamMap {
@@ -114,9 +115,10 @@ func splitStream(m types.Migrateable) ([]types.Migrateable, error) {
 						ww := csv.NewWriter(&bb)
 						defer ww.Flush()
 						bufs[nm] = &SplitBuffer{
-							buffer: &bb,
-							writer: ww,
-							name:   nm,
+							buffer:    &bb,
+							writer:    ww,
+							name:      nm,
+							hasHeader: false,
 						}
 					}
 
@@ -159,8 +161,7 @@ func splitStream(m types.Migrateable) ([]types.Migrateable, error) {
 						from = baseFIeld
 					}
 
-					bufs[nm].row = append(bufs[nm].row, record[hMap[from]])
-					if i == 0 {
+					if !bufs[nm].hasHeader {
 						bufs[nm].header = append(bufs[nm].header, nmF)
 					}
 				}