removing injection of housetype from assets (#95)

Author: tobiasehlert

src/HousesMapping.go

@@ -14,9 +14,8 @@ var (
 )
 
 type AssetsHouse struct {
-	HouseID   int    `json:"house_id"`
-	Town      string `json:"town"`
-	HouseType string `json:"type"`
+	HouseID int    `json:"house_id"`
+	Town    string `json:"town"`
 }
 type HousesMapping struct {
 	Houses []AssetsHouse `json:"houses"`
@@ -65,12 +64,12 @@ func TibiaDataHousesMappingInitiator() {
 	}
 }
 
-// TibiaDataHousesMapResolver func - used to return both town and type
-func TibiaDataHousesMapResolver(houseid int) (town string, housetype string) {
+// TibiaDataHousesMapResolver func - used to return town
+func TibiaDataHousesMapResolver(houseid int) (town string) {
 	for _, value := range TibiaDataHousesMapping.Houses {
 		if houseid == value.HouseID {
-			return value.Town, value.HouseType
+			return value.Town
 		}
 	}
-	return "", ""
+	return ""
 }

src/TibiaHousesHouseV3.go

@@ -95,10 +95,11 @@ func TibiaHousesHouseV3Impl(houseid string, BoxContentHTML string) HouseResponse
 		HouseData.Houseid = TibiaDataStringToIntegerV3(houseid)
 		HouseData.World = subma1[0][8]
 
-		HouseData.Town, HouseData.Type = TibiaDataHousesMapResolver(HouseData.Houseid)
+		HouseData.Town = TibiaDataHousesMapResolver(HouseData.Houseid)
 
 		HouseData.Name = TibiaDataSanitizeEscapedString(subma1[0][2])
 		HouseData.Img = subma1[0][1]
+		HouseData.Type = subma1[0][3]
 		HouseData.Beds = TibiaDataStringToIntegerV3(subma1[0][4])
 		HouseData.Size = TibiaDataStringToIntegerV3(subma1[0][5])
 		HouseData.Rent = TibiaDataConvertValuesWithK(subma1[0][6] + subma1[0][7])

src/TibiaHousesHouseV3_test.go

@@ -21,7 +21,7 @@ func TestCormaya10(t *testing.T) {
 	assert.Equal("Premia", houseJson.House.World)
 	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
 	assert.Equal("Cormaya 10", houseJson.House.Name)
-	assert.Equal("", houseJson.House.Type) //depends on TibiaDataHousesMapResolver
+	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(3, houseJson.House.Beds)
 	assert.Equal(80, houseJson.House.Size)
 	assert.Equal(300000, houseJson.House.Rent)
@@ -61,7 +61,7 @@ func TestCormaya11(t *testing.T) {
 	assert.Equal("Premia", houseJson.House.World)
 	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
 	assert.Equal("Cormaya 11", houseJson.House.Name)
-	assert.Equal("", houseJson.House.Type) //depends on TibiaDataHousesMapResolver
+	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(2, houseJson.House.Beds)
 	assert.Equal(43, houseJson.House.Size)
 	assert.Equal(150000, houseJson.House.Rent)
@@ -98,7 +98,7 @@ func TestBeachHomeApartmentsFlat14(t *testing.T) {
 	assert.Equal("Premia", houseJson.House.World)
 	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
 	assert.Equal("Beach Home Apartments, Flat 14", houseJson.House.Name)
-	assert.Equal("", houseJson.House.Type) //depends on TibiaDataHousesMapResolver
+	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(1, houseJson.House.Beds)
 	assert.Equal(7, houseJson.House.Size)
 	assert.Equal(25000, houseJson.House.Rent)
@@ -135,7 +135,7 @@ func TestBeachHomeApartmentsFlat15(t *testing.T) {
 	assert.Equal("Premia", houseJson.House.World)
 	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
 	assert.Equal("Beach Home Apartments, Flat 15", houseJson.House.Name)
-	assert.Equal("", houseJson.House.Type) //depends on TibiaDataHousesMapResolver
+	assert.Equal("house", houseJson.House.Type)
 	assert.Equal(1, houseJson.House.Beds)
 	assert.Equal(7, houseJson.House.Size)
 	assert.Equal(25000, houseJson.House.Rent)