adding support for finished auctions (#115)

Author: tobiasehlert

src/TibiaHousesHouseV3_test.go

@@ -84,6 +84,43 @@ func TestCormaya11(t *testing.T) {
 	assert.Equal("2022-01-21T09:00:00Z", houseAuction.AuctionEnd)
 }
 
+func TestCormaya9c(t *testing.T) {
+	data, err := os.ReadFile("../testdata/houses/Premia/Edron/Cormaya9c.html")
+	if err != nil {
+		t.Errorf("File reading error: %s", err)
+		return
+	}
+
+	houseJson := TibiaHousesHouseV3Impl("54023", string(data))
+	assert := assert.New(t)
+
+	assert.Equal(54023, houseJson.House.Houseid)
+	assert.Equal("Premia", houseJson.House.World)
+	assert.Equal("", houseJson.House.Town) //depends on TibiaDataHousesMapResolver
+	assert.Equal("Cormaya 9c", houseJson.House.Name)
+	assert.Equal("house", houseJson.House.Type)
+	assert.Equal(2, houseJson.House.Beds)
+	assert.Equal(25, houseJson.House.Size)
+	assert.Equal(80000, houseJson.House.Rent)
+	assert.Equal("https://static.tibia.com/images/houses/house_54023.png", houseJson.House.Img)
+
+	houseStatus := houseJson.House.Status
+	assert.NotNil(houseStatus)
+	assert.True(houseStatus.IsAuctioned)
+	assert.False(houseStatus.IsRented)
+	assert.False(houseStatus.IsMoving)
+	assert.False(houseStatus.IsTransfering)
+	assert.Equal(HouseRental{Owner: "", OwnerSex: "", PaidUntil: "", MovingDate: "", TransferReceiver: "", TransferPrice: 0, TransferAccept: false}, houseStatus.Rental)
+	assert.Equal("The house is currently being auctioned. The auction has ended at Jan 21 2022, 10:00:00 CET. The highest bid so far is 12345 gold and has been submitted by Ciuchy Szajba.", houseStatus.Original)
+
+	houseAuction := houseJson.House.Status.Auction
+	assert.NotNil(houseAuction)
+	assert.Equal(12345, houseAuction.CurrentBid)
+	assert.Equal("Ciuchy Szajba", houseAuction.CurrentBidder)
+	assert.False(houseAuction.AuctionOngoing)
+	assert.Equal("2022-01-21T09:00:00Z", houseAuction.AuctionEnd)
+}
+
 func TestBeachHomeApartmentsFlat14(t *testing.T) {
 	data, err := os.ReadFile("../testdata/houses/Premia/Thais/BeachHomeApartmentsFlat14.html")
 	if err != nil {

src/TibiaHousesOverviewV3.go

@@ -25,6 +25,7 @@ type HousesHouse struct {
 	Rent        int           `json:"rent"`
 	IsRented    bool          `json:"rented"`
 	IsAuctioned bool          `json:"auctioned"`
+	IsFinished  bool          `json:"finished"`
 	Auction     HousesAuction `json:"auction"`
 }
 
@@ -44,7 +45,7 @@ type HousesOverviewResponse struct {
 
 var (
 	houseOverviewDataRegex      = regexp.MustCompile(`<td.*><nobr>(.*)<\/nobr><\/td><td.*><nobr>([0-9]+).sqm<\/nobr><\/td><td.*><nobr>([0-9]+)(k+).gold<\/nobr><\/td><td.*><nobr>(.*)<\/nobr><\/td>.*houseid" value="([0-9]+)"\/><div.*`)
-	houseOverviewAuctionedRegex = regexp.MustCompile(`auctioned.\(([0-9]+).gold;.(.*).left\)`)
+	houseOverviewAuctionedRegex = regexp.MustCompile(`auctioned.\(([0-9]+).gold;.(finished|(.*).left)\)`)
 )
 
 // TibiaHousesOverviewV3 func
@@ -111,7 +112,11 @@ func TibiaHousesOverviewV3Impl(c *gin.Context, world string, town string, htmlDa
 					house.IsAuctioned = true
 					subma1b := houseOverviewAuctionedRegex.FindAllStringSubmatch(s, -1)
 					house.Auction.AuctionBid = TibiaDataStringToIntegerV3(subma1b[0][1])
-					house.Auction.AuctionLeft = subma1b[0][2]
+					if subma1b[0][2] == "finished" {
+						house.IsFinished = true
+					} else {
+						house.Auction.AuctionLeft = subma1b[0][3]
+					}
 				}
 
 				// append house to list houses/guildhalls

src/TibiaHousesOverviewV3_test.go

@@ -46,6 +46,7 @@ func TestAnticaThaisHousesOverview(t *testing.T) {
 	assert.Equal(50000, firstHouse.Rent)
 	assert.True(firstHouse.IsRented)
 	assert.False(firstHouse.IsAuctioned)
+	assert.False(firstHouse.IsFinished)
 	assert.Equal(HousesAuction{AuctionBid: 0, AuctionLeft: ""}, firstHouse.Auction)
 
 	lastHouse := housesJson.Houses.HouseList[117]
@@ -55,6 +56,7 @@ func TestAnticaThaisHousesOverview(t *testing.T) {
 	assert.Equal(600000, lastHouse.Rent)
 	assert.True(lastHouse.IsRented)
 	assert.False(lastHouse.IsAuctioned)
+	assert.False(lastHouse.IsFinished)
 	assert.Equal(HousesAuction{AuctionBid: 0, AuctionLeft: ""}, lastHouse.Auction)
 
 	assert.Equal(14, len(housesJson.Houses.GuildhallList))
@@ -66,6 +68,7 @@ func TestAnticaThaisHousesOverview(t *testing.T) {
 	assert.Equal(500000, firstGuild.Rent)
 	assert.True(firstGuild.IsRented)
 	assert.False(firstGuild.IsAuctioned)
+	assert.False(firstGuild.IsFinished)
 	assert.Equal(HousesAuction{AuctionBid: 0, AuctionLeft: ""}, firstGuild.Auction)
 
 	lastGuild := housesJson.Houses.GuildhallList[13]
@@ -75,6 +78,7 @@ func TestAnticaThaisHousesOverview(t *testing.T) {
 	assert.Equal(5000000, lastGuild.Rent)
 	assert.True(lastGuild.IsRented)
 	assert.False(lastGuild.IsAuctioned)
+	assert.False(lastGuild.IsFinished)
 	assert.Equal(HousesAuction{AuctionBid: 0, AuctionLeft: ""}, lastGuild.Auction)
 }
 
@@ -116,6 +120,7 @@ func TestPremiaFarmineHousesOverview(t *testing.T) {
 	assert.Equal(150000, firstHouse.Rent)
 	assert.False(firstHouse.IsRented)
 	assert.True(firstHouse.IsAuctioned)
+	assert.False(firstHouse.IsFinished)
 	assert.Equal(HousesAuction{AuctionBid: 0, AuctionLeft: ""}, firstHouse.Auction)
 
 	assert.Equal(0, len(housesJson.Houses.GuildhallList))
@@ -159,7 +164,18 @@ func TestPremiaEdronHousesOverview(t *testing.T) {
 	assert.Equal(150000, auctionedHouse.Rent)
 	assert.False(auctionedHouse.IsRented)
 	assert.True(auctionedHouse.IsAuctioned)
+	assert.False(auctionedHouse.IsFinished)
 	assert.Equal(HousesAuction{AuctionBid: 200000, AuctionLeft: "9 hours"}, auctionedHouse.Auction)
 
+	secondAuctionedHouse := housesJson.Houses.HouseList[56]
+	assert.Equal("Cormaya 9c", secondAuctionedHouse.Name)
+	assert.Equal(54023, secondAuctionedHouse.HouseID)
+	assert.Equal(25, secondAuctionedHouse.Size)
+	assert.Equal(80000, secondAuctionedHouse.Rent)
+	assert.False(secondAuctionedHouse.IsRented)
+	assert.True(secondAuctionedHouse.IsAuctioned)
+	assert.True(secondAuctionedHouse.IsFinished)
+	assert.Equal(HousesAuction{AuctionBid: 12345, AuctionLeft: ""}, secondAuctionedHouse.Auction)
+
 	assert.Equal(6, len(housesJson.Houses.GuildhallList))
 }