Update chase scrape

scrape.go

@@ -84,41 +84,63 @@ func (c *chaseScraper) scrape(m *mail.Message) ([]*Transaction, error) {
 }
 
 func (c *citiScraper) scrape(m *mail.Message) ([]*Transaction, error) {
+	date := fmt.Sprint(m.Header["Date"])
 	b, err := ioutil.ReadAll(m.Body)
 	if err != nil {
 		return nil, err
 	}
-	targetLineRegexp := regexp.MustCompile(`Account #: XXXX[0-9]{4} .*`)
+	re := regexp.MustCompile(`Citi Alert: A \$[0-9][0-9]*\.[0-9][0-9] transaction was made at .* on card ending in`)
-	targetMatches := targetLineRegexp.FindAll(b, -1)
+	match := re.Find(b)
-	if len(targetMatches) == 0 {
+	if len(match) == 0 {
-		return nil, errors.New("no lines with transactions found")
+		return nil, nil
 	}
 
-	results := make(map[string][]string)
+	rePrice := regexp.MustCompile(`[0-9][0-9]*\.[0-9][0-9]`)
-	for _, b := range targetMatches {
+	price := rePrice.Find(match)
-		// Account #: XXXX3837 $137.87 at AMZN Mktp US           Amzn.com/bill WA on 04/03/2020, 09:05 PM ET
+
-		regexp := regexp.MustCompile(`Account #: XXXX[0-9]{4} \$(?P<amount>[0-9]+\.[0-9]*) at (?P<account>[^,]*)`)
+	vendor := bytes.Split(bytes.Split(match, []byte(" on card ending in"))[0], []byte("transaction was made at "))[1]
-		matches := regexp.FindSubmatch(b)
+
-		if len(matches) < 2 {
+	transaction := NewTransaction(string(price), string(vendor), date, Citi)
-			return nil, fmt.Errorf("no full matches found: %s", b)
+
+	return []*Transaction{transaction}, nil
+	//Citi Alert: A $598.14 transaction was made at REMIX MUSIC SPRINGDA on card ending in 3837
+	/*
+		b, err := ioutil.ReadAll(m.Body)
+		if err != nil {
+			return nil, err
 		}
-		for i, name := range regexp.SubexpNames() {
+		targetLineRegexp := regexp.MustCompile(`Account #: XXXX[0-9]{4} .*`)
-			if i != 0 && name != "" {
+		targetMatches := targetLineRegexp.FindAll(b, -1)
-				if name == "account" {
+		if len(targetMatches) == 0 {
-					matches[i] = bytes.Split(matches[i], []byte(" on "))[0]
+			return nil, errors.New("no lines with transactions found")
+		}
+
+		results := make(map[string][]string)
+		for _, b := range targetMatches {
+			// Account #: XXXX3837 $137.87 at AMZN Mktp US           Amzn.com/bill WA on 04/03/2020, 09:05 PM ET
+			regexp := regexp.MustCompile(`Account #: XXXX[0-9]{4} \$(?P<amount>[0-9]+\.[0-9]*) at (?P<account>[^,]*)`)
+			matches := regexp.FindSubmatch(b)
+			if len(matches) < 2 {
+				return nil, fmt.Errorf("no full matches found: %s", b)
+			}
+			for i, name := range regexp.SubexpNames() {
+				if i != 0 && name != "" {
+					if name == "account" {
+						matches[i] = bytes.Split(matches[i], []byte(" on "))[0]
+					}
+					results[name] = append(results[name], string(matches[i]))
 				}
-				results[name] = append(results[name], string(matches[i]))
+			}
+			if len(results) != 2 || len(results["amount"]) != len(results["account"]) {
+				return nil, fmt.Errorf("unexpected matches found looking for transactions: %+v", results)
 			}
 		}
-		if len(results) != 2 || len(results["amount"]) != len(results["account"]) {
+
-			return nil, fmt.Errorf("unexpected matches found looking for transactions: %+v", results)
+		transactions := make([]*Transaction, len(results["amount"]))
+		for i := range results["amount"] {
+			transactions[i] = NewTransaction(results["amount"][i], results["account"][i], fmt.Sprint(m.Header["Date"]), Citi)
 		}
-	}
 
-	transactions := make([]*Transaction, len(results["amount"]))
+		return transactions, nil
-	for i := range results["amount"] {
+	*/
-		transactions[i] = NewTransaction(results["amount"][i], results["account"][i], fmt.Sprint(m.Header["Date"]), Citi)
-	}
-
-	return transactions, nil
 }