#1 all ratings are maped

cmd/conv/main.go

@@ -19,5 +19,10 @@ func main() {
 	}
 	defer xf.Close()
 	eBalance, err := loader.XLSX(xf, nil)
-	fmt.Printf("%s\n%#v", err, eBalance.CompanyFacts.IndustrySectors)
+	//fmt.Printf("%s\n%#v", err, eBalance.CompanyFacts.Rating.Topics[1])
+
+	out, err := os.OpenFile("eCalc.json", os.O_CREATE, 0777)
+	fmt.Println("createFileErr:", err)
+	eBalance.EncodeJSON(out)
+	out.Close()
 }

pkg/ecalc/ecalc.go

@@ -1,78 +1,90 @@
 package ecalc
 
+import (
+	"encoding/json"
+	"io"
+)
+
 type Ecalc struct {
 	ID           int          `json:"id,omitempty"`
-	Type         string       `json:"type,omitempty"`
-	Version      string       `json:"version,omitempty"`
-	CompanyFacts CompanyFacts `json:"companyFacts,omitempty"`
+	Type         string       `json:"type"`
+	Version      string       `json:"version"`
+	CompanyFacts CompanyFacts `json:"companyFacts"`
+}
+
+// EncodeJSON writes the JSON of the conf into the Writer
+func (e Ecalc) EncodeJSON(w io.Writer) error {
+	enc := json.NewEncoder(w)
+	enc.SetIndent("", "  ")
+	return enc.Encode(e)
 }
 
 type CompanyFacts struct {
 	ID                               int                 `json:"id,omitempty"`
-	TotalPurchaseFromSuppliers       int                 `json:"totalPurchaseFromSuppliers,omitempty"`
-	TotalStaffCosts                  int                 `json:"totalStaffCosts,omitempty"`
-	Profit                           int                 `json:"profit,omitempty"`
-	FinancialCosts                   int                 `json:"financialCosts,omitempty"`
-	IncomeFromFinancialInvestments   int                 `json:"incomeFromFinancialInvestments,omitempty"`
-	AdditionsToFixedAssets           int                 `json:"additionsToFixedAssets,omitempty"`
-	Turnover                         int                 `json:"turnover,omitempty"`
-	TotalAssets                      int                 `json:"totalAssets,omitempty"`
-	FinancialAssetsAndCashBalance    int                 `json:"financialAssetsAndCashBalance,omitempty"`
-	SupplyFractions                  []SupplyFraction    `json:"supplyFractions,omitempty"`
-	EmployeesFractions               []EmployeesFraction `json:"employeesFractions,omitempty"`
-	IndustrySectors                  []IndustrySector    `json:"industrySectors,omitempty"`
-	NumberOfEmployees                int                 `json:"numberOfEmployees,omitempty"`
-	HasCanteen                       bool                `json:"hasCanteen,omitempty"`
-	IsB2B                            bool                `json:"isB2B,omitempty"`
-	AverageJourneyToWorkForStaffInKm float64             `json:"averageJourneyToWorkForStaffInKm,omitempty"`
-	Rating                           Rating              `json:"rating,omitempty"`
+	TotalPurchaseFromSuppliers       int                 `json:"totalPurchaseFromSuppliers"`
+	TotalStaffCosts                  int                 `json:"totalStaffCosts"`
+	Profit                           int                 `json:"profit"`
+	FinancialCosts                   int                 `json:"financialCosts"`
+	IncomeFromFinancialInvestments   int                 `json:"incomeFromFinancialInvestments"`
+	AdditionsToFixedAssets           int                 `json:"additionsToFixedAssets"`
+	Turnover                         int                 `json:"turnover"`
+	TotalAssets                      int                 `json:"totalAssets"`
+	FinancialAssetsAndCashBalance    int                 `json:"financialAssetsAndCashBalance"`
+	SupplyFractions                  []SupplyFraction    `json:"supplyFractions"`
+	EmployeesFractions               []EmployeesFraction `json:"employeesFractions"`
+	IndustrySectors                  []IndustrySector    `json:"industrySectors"`
+	NumberOfEmployees                int                 `json:"numberOfEmployees"`
+	HasCanteen                       bool                `json:"hasCanteen"`
+	IsB2B                            bool                `json:"isB2B"`
+	AverageJourneyToWorkForStaffInKm float64             `json:"averageJourneyToWorkForStaffInKm"`
+	Rating                           Rating              `json:"rating"`
 }
 
 type SupplyFraction struct {
 	ID           int    `json:"id,omitempty"`
-	IndustryCode string `json:"industryCode,omitempty"`
-	CountryCode  string `json:"countryCode,omitempty"`
-	Costs        int    `json:"costs,omitempty"`
+	IndustryCode string `json:"industryCode"`
+	CountryCode  string `json:"countryCode"`
+	Costs        int    `json:"costs"`
 }
 
 type EmployeesFraction struct {
 	ID          int     `json:"id,omitempty"`
-	CountryCode string  `json:"countryCode,omitempty"`
-	Percentage  float64 `json:"percentage,omitempty"`
+	CountryCode string  `json:"countryCode"`
+	Percentage  float64 `json:"percentage"`
 }
 
 type IndustrySector struct {
 	ID                    int    `json:"id,omitempty"`
-	IndustryCode          string `json:"industryCode,omitempty"`
-	AmountOfTotalTurnover int    `json:"amountOfTotalTurnover,omitempty"`
-	Description           string `json:"description,omitempty"`
+	IndustryCode          string `json:"industryCode"`
+	AmountOfTotalTurnover int    `json:"amountOfTotalTurnover"`
+	Description           string `json:"description"`
 }
 
 type Rating struct {
-	Topics []Topic `json:"topics,omitempty"`
+	Topics []Topic `json:"topics"`
 }
 
 type Topic struct {
-	Points                 int      `json:"points,omitempty"`
-	MaxPoints              float64  `json:"maxPoints,omitempty"`
+	Points                 int      `json:"points"`
+	MaxPoints              float64  `json:"maxPoints"`
 	ID                     int      `json:"id,omitempty"`
-	ShortName              string   `json:"shortName,omitempty"`
-	Name                   string   `json:"name,omitempty"`
-	Estimations            int      `json:"estimations,omitempty"`
-	Weight                 float64  `json:"weight,omitempty"`
-	IsWeightSelectedByUser bool     `json:"isWeightSelectedByUser,omitempty"`
-	Aspects                []Aspect `json:"aspects,omitempty"`
+	ShortName              string   `json:"shortName"`
+	Name                   string   `json:"name"`
+	Estimations            int      `json:"estimations"`
+	Weight                 float64  `json:"weight"`
+	IsWeightSelectedByUser bool     `json:"isWeightSelectedByUser"`
+	Aspects                []Aspect `json:"aspects"`
 }
 
 type Aspect struct {
-	Points                 int      `json:"points,omitempty"`
-	MaxPoints              float64  `json:"maxPoints,omitempty"`
+	Points                 int      `json:"points"`
+	MaxPoints              float64  `json:"maxPoints"`
 	ID                     int      `json:"id,omitempty"`
-	ShortName              string   `json:"shortName,omitempty"`
-	Name                   string   `json:"name,omitempty"`
-	Estimations            int      `json:"estimations,omitempty"`
-	Weight                 float64  `json:"weight,omitempty"`
-	IsWeightSelectedByUser bool     `json:"isWeightSelectedByUser,omitempty"`
-	Aspects                []Aspect `json:"aspects,omitempty"`
-	IsPositive             bool     `json:"isPositive,omitempty"`
+	ShortName              string   `json:"shortName"`
+	Name                   string   `json:"name"`
+	Estimations            int      `json:"estimations"`
+	Weight                 float64  `json:"weight"`
+	IsWeightSelectedByUser bool     `json:"isWeightSelectedByUser"`
+	Aspects                []Aspect `json:"aspects"`
+	IsPositive             bool     `json:"isPositive"`
 }

pkg/loader/conf.go

@@ -81,15 +81,23 @@ type AreaCol struct {
 // The cols must be defined by the letter of the col
 // for example "A" for the first col
 type Rating struct {
-	Sheet             int    `json:"sheet"`
-	StartRow          int    `json:"start_row"`
-	EndRow            int    `json:"end_row"`
-	PointsCol         string `json:"points_col"`
-	MaxPointsCol      string `json:"max_points_col"`
-	IDCol             string `json:"id_col"`
-	ShortNameCol      string `json:"short_name_col"`
-	NameCol           string `json:"name_col"`
-	EstimationsCol    string `json:"estimations_col"`
-	WeightCol         string `json:"weight_col"`
-	SelectedByUserCol string `json:"selected_by_user_col"`
+	Sheet             int         `json:"sheet"`
+	StartRow          int         `json:"start_row"`
+	EndRow            int         `json:"end_row"`
+	Cols              []RatingCol `json:"cols"`
+	PointsCol         string      `json:"points_col"`
+	MaxPointsCol      string      `json:"max_points_col"`
+	IDCol             string      `json:"id_col"`
+	ShortNameCol      string      `json:"short_name_col"`
+	NameCol           string      `json:"name_col"`
+	EstimationsCol    string      `json:"estimations_col"`
+	WeightCol         string      `json:"weight_col"`
+	SelectedByUserCol string      `json:"selected_by_user_col"`
+}
+
+type RatingCol struct {
+	Col     string `json:"col"`
+	Field   string `json:"field"`
+	Type    string `json:"type"`
+	Default string `json:"default"`
 }

pkg/loader/conf/default.json

@@ -185,14 +185,45 @@
         "sheet": 3,
         "start_row": 9,
         "end_row": 93,
-        "points_col": "I",
-        "max_points_col": "J",
-        "id_col": "",
         "short_name_col": "B",
-        "name_col": "C",
-        "estimations_col": "H",
-        "weight_col": "D",
-        "selected_by_user_col": "N"
+        "cols": [
+          {
+            "col": "I",
+            "field": "Points",
+            "type": "int",
+            "default": ""
+          },
+          {
+            "col": "J",
+            "field": "MaxPoints",
+            "type": "float64",
+            "default": ""
+          },
+          {
+            "col": "C",
+            "field": "Name",
+            "type": "int",
+            "default": ""
+          },
+          {
+            "col": "H",
+            "field": "Estimations",
+            "type": "int",
+            "default": ""
+          },
+          {
+            "col": "D",
+            "field": "Weight",
+            "type": "float64",
+            "default": ""
+          },
+          {
+            "col": "N",
+            "field": "IsWeightSelectedByUser",
+            "type": "bool",
+            "default": ""
+          }
+        ]
       }
   }
   

pkg/loader/loader.go

@@ -94,6 +94,52 @@ func XLSX(r io.Reader, conf *Conf) (*ecalc.Ecalc, error) {
 		}
 
 	}
+	var topic ecalc.Topic
+	for r := conf.Rating.StartRow; r <= conf.Rating.EndRow; r++ {
+		shortName, err := xFile.GetCellValue(
+			xFile.GetSheetName(conf.Rating.Sheet),
+			fmt.Sprintf("%s%d", conf.Rating.ShortNameCol, r),
+		)
+		if err != nil {
+			errs = append(errs, err)
+		}
+		if len(shortName) < 2 {
+			continue
+		} else if len(shortName) == 2 {
+			if topic.ShortName != "" {
+				eBalance.CompanyFacts.Rating.Topics = append(eBalance.CompanyFacts.Rating.Topics, topic)
+			}
+			topic = ecalc.Topic{
+				ShortName: shortName,
+			}
+			for _, c := range conf.Rating.Cols {
+				cellValue, err := xFile.GetCellValue(
+					xFile.GetSheetName(conf.Rating.Sheet),
+					fmt.Sprintf("%s%d", c.Col, r),
+				)
+				if err != nil {
+					errs = append(errs, err)
+				}
+				set.Field(&topic, c.Field, cellValue)
+			}
+		} else {
+			aspect := ecalc.Aspect{
+				ShortName: shortName,
+			}
+			for _, c := range conf.Rating.Cols {
+				cellValue, err := xFile.GetCellValue(
+					xFile.GetSheetName(conf.Rating.Sheet),
+					fmt.Sprintf("%s%d", c.Col, r),
+				)
+				if err != nil {
+					errs = append(errs, err)
+				}
+				set.Field(&aspect, c.Field, cellValue)
+			}
+			topic.Aspects = append(topic.Aspects, aspect)
+		}
+	}
+	eBalance.CompanyFacts.Rating.Topics = append(eBalance.CompanyFacts.Rating.Topics, topic)
 	// TODO: error handling of errs
 	return eBalance, nil
 }