Some major changes (#14)
Reviewed-on: #14 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
phoenix
+31
-35
@@ -1,48 +1,49 @@
|
||||
package parser
|
||||
|
||||
import "fmt"
|
||||
import "os"
|
||||
import "unicode"
|
||||
import (
|
||||
"bufio"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"strings"
|
||||
"unicode"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/contact"
|
||||
)
|
||||
import "encoding/json"
|
||||
import "strings"
|
||||
|
||||
const Letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
|
||||
type SomeObject struct {
|
||||
Value string `json:"value"`
|
||||
}
|
||||
|
||||
type NumberParser struct {
|
||||
FilePath string
|
||||
}
|
||||
|
||||
func (prsr NumberParser) FileDump() []SomeObject {
|
||||
func (prsr *NumberParser) FileDump() []contact.Contact {
|
||||
fmt.Println("Dumping files")
|
||||
objs := []SomeObject{}
|
||||
objs := []contact.Contact{}
|
||||
|
||||
for _, line := range prsr.readLines(prsr.FilePath) {
|
||||
if strings.ContainsAny(line, Letters) {
|
||||
continue
|
||||
}
|
||||
|
||||
myObj := SomeObject{Value: line}
|
||||
if myObj.Value != "" {
|
||||
myObj := contact.Contact{PhoneNumber: line}
|
||||
if myObj.PhoneNumber != "" {
|
||||
objs = append(objs, myObj)
|
||||
}
|
||||
}
|
||||
|
||||
objs = prsr.updateContacts(objs)
|
||||
objs = prsr.removeDups(objs)
|
||||
|
||||
return objs
|
||||
}
|
||||
|
||||
func (prsr NumberParser) UpdateValues(vals []SomeObject) []SomeObject {
|
||||
updated := []SomeObject{}
|
||||
func (prsr *NumberParser) updateContacts(contacts []contact.Contact) []contact.Contact {
|
||||
updated := []contact.Contact{}
|
||||
|
||||
for _, val := range vals {
|
||||
parsed := val.Value
|
||||
for _, ct := range contacts {
|
||||
parsed := ct.PhoneNumber
|
||||
if len(parsed) < 2 {
|
||||
fmt.Println("Invalid number:", parsed)
|
||||
continue
|
||||
@@ -54,49 +55,44 @@ func (prsr NumberParser) UpdateValues(vals []SomeObject) []SomeObject {
|
||||
fmt.Println(parsed)
|
||||
|
||||
updatedParsed := prsr.addPrefix(parsed)
|
||||
updated = append(updated, SomeObject{Value: updatedParsed})
|
||||
updated = append(updated, contact.Contact{PhoneNumber: updatedParsed})
|
||||
}
|
||||
|
||||
return updated
|
||||
}
|
||||
|
||||
func (prsr NumberParser) RemoveDups(vals []SomeObject) []SomeObject {
|
||||
updated := []SomeObject{}
|
||||
func (prsr *NumberParser) removeDups(contacts []contact.Contact) []contact.Contact {
|
||||
updated := []contact.Contact{}
|
||||
uniqueItems := make(map[string]string)
|
||||
|
||||
for _, val := range vals {
|
||||
uniqueItems[val.Value] = val.Value
|
||||
for _, val := range contacts {
|
||||
uniqueItems[val.PhoneNumber] = val.PhoneNumber
|
||||
}
|
||||
|
||||
for _, item := range uniqueItems {
|
||||
updated = append(updated, SomeObject{Value: item})
|
||||
updated = append(updated, contact.Contact{PhoneNumber: item})
|
||||
}
|
||||
|
||||
return updated
|
||||
}
|
||||
|
||||
func (prsr NumberParser) PrintValues(vals []SomeObject, printTotal bool) {
|
||||
fmt.Println("Printing values")
|
||||
func (prsr NumberParser) PrintValues(contacts []contact.Contact, printTotal bool) {
|
||||
fmt.Println("Printing numbers")
|
||||
|
||||
for _, val := range vals {
|
||||
fmt.Println("Value:", val.Value)
|
||||
for _, ct := range contacts {
|
||||
fmt.Println("Number:", ct.PhoneNumber)
|
||||
}
|
||||
|
||||
if printTotal {
|
||||
fmt.Println("Total Numbers:", len(vals))
|
||||
fmt.Println("Total Numbers:", len(contacts))
|
||||
}
|
||||
}
|
||||
|
||||
func (prsr NumberParser) SaveFile(vals []SomeObject) {
|
||||
func (prsr NumberParser) SaveFile(vals []contact.Contact) {
|
||||
filename := "numbers.json"
|
||||
allNumbers := []string{}
|
||||
|
||||
for _, val := range vals {
|
||||
allNumbers = append(allNumbers, val.Value)
|
||||
}
|
||||
|
||||
// Create json and save it to the filesystem
|
||||
jsonData, err := json.MarshalIndent(allNumbers, "", " ")
|
||||
jsonData, err := json.MarshalIndent(&vals, "", " ")
|
||||
if err != nil {
|
||||
fmt.Println("Error marshaling JSON:", err)
|
||||
return
|
||||
|
||||
+20
-79
@@ -1,91 +1,32 @@
|
||||
package parser
|
||||
|
||||
import "testing"
|
||||
import "fmt"
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/contact"
|
||||
)
|
||||
|
||||
const Test_File_Path = "../tests/numbers.txt"
|
||||
|
||||
// Add three tests
|
||||
// File dump
|
||||
func Test_FileDump(t *testing.T) {
|
||||
parser := NumberParser{FilePath: Test_File_Path}
|
||||
rawValues := parser.FileDump()
|
||||
|
||||
testValues := []SomeObject{
|
||||
{Value: "(217) 555-0194"},
|
||||
{Value: "(602) 555-0177"},
|
||||
{Value: "(713) 555-0167"},
|
||||
{Value: "(608) 555-0190"},
|
||||
{Value: "(305) 555-0112"},
|
||||
{Value: "(415) 555-0135"},
|
||||
{Value: "(608) 555-0190"},
|
||||
{Value: "(602) 555-0177"},
|
||||
{Value: "(317) 555-0123"},
|
||||
{Value: "(360) 555-0158"},
|
||||
}
|
||||
|
||||
if len(rawValues) < 1 {
|
||||
t.Error("Dump should not be empty")
|
||||
}
|
||||
|
||||
if !dataEqual(rawValues, testValues) {
|
||||
t.Error("File dump was not correctly dump")
|
||||
}
|
||||
}
|
||||
|
||||
// Parse values
|
||||
func Test_Parsed(t *testing.T) {
|
||||
parser := NumberParser{FilePath: Test_File_Path}
|
||||
rawValues := parser.FileDump()
|
||||
|
||||
if len(rawValues) < 1 {
|
||||
t.Error("Dump should not be empty")
|
||||
}
|
||||
|
||||
parsed := parser.UpdateValues(rawValues)
|
||||
testValues := []SomeObject{
|
||||
{Value: "+12175550194"},
|
||||
{Value: "+16025550177"},
|
||||
{Value: "+17135550167"},
|
||||
{Value: "+16085550190"},
|
||||
{Value: "+13055550112"},
|
||||
{Value: "+14155550135"},
|
||||
{Value: "+16085550190"},
|
||||
{Value: "+16025550177"},
|
||||
{Value: "+13175550123"},
|
||||
{Value: "+13605550158"},
|
||||
}
|
||||
|
||||
aSize := len(parsed)
|
||||
bSize := len(testValues)
|
||||
if aSize != bSize {
|
||||
t.Error("Data has varrying sizes A", aSize, " B", bSize)
|
||||
}
|
||||
if !dataEqual(parsed, testValues) {
|
||||
t.Error("Data has not be updated")
|
||||
}
|
||||
}
|
||||
|
||||
// Remove duplicates
|
||||
func Test_RemoveDups(t *testing.T) {
|
||||
parser := NumberParser{FilePath: Test_File_Path}
|
||||
rawValues := parser.FileDump()
|
||||
finalAmount := parser.FileDump()
|
||||
|
||||
if len(rawValues) < 1 {
|
||||
if len(finalAmount) < 1 {
|
||||
t.Error("Dump should not be empty")
|
||||
}
|
||||
|
||||
parsed := parser.UpdateValues(rawValues)
|
||||
finalAmount := parser.RemoveDups(parsed)
|
||||
testValues := []SomeObject{
|
||||
{Value: "+12175550194"},
|
||||
{Value: "+16025550177"},
|
||||
{Value: "+17135550167"},
|
||||
{Value: "+16085550190"},
|
||||
{Value: "+13055550112"},
|
||||
{Value: "+14155550135"},
|
||||
{Value: "+13175550123"},
|
||||
{Value: "+13605550158"},
|
||||
testValues := []contact.Contact{
|
||||
{PhoneNumber: "+12175550194"},
|
||||
{PhoneNumber: "+16025550177"},
|
||||
{PhoneNumber: "+17135550167"},
|
||||
{PhoneNumber: "+16085550190"},
|
||||
{PhoneNumber: "+13055550112"},
|
||||
{PhoneNumber: "+14155550135"},
|
||||
{PhoneNumber: "+13175550123"},
|
||||
{PhoneNumber: "+13605550158"},
|
||||
}
|
||||
|
||||
aSize := len(finalAmount)
|
||||
@@ -96,18 +37,18 @@ func Test_RemoveDups(t *testing.T) {
|
||||
if !dataEqual(finalAmount, testValues) {
|
||||
fmt.Println("Printing final amount")
|
||||
for _, val := range finalAmount {
|
||||
fmt.Println("Value:", val.Value)
|
||||
fmt.Println("PhoneNumber:", val.PhoneNumber)
|
||||
}
|
||||
fmt.Println("Printing test values")
|
||||
for _, val := range testValues {
|
||||
fmt.Println("Value:", val.Value)
|
||||
fmt.Println("PhoneNumber:", val.PhoneNumber)
|
||||
}
|
||||
|
||||
t.Error("Data has not be updated")
|
||||
}
|
||||
}
|
||||
|
||||
func dataEqual(a, b []SomeObject) bool {
|
||||
func dataEqual(a, b []contact.Contact) bool {
|
||||
if len(a) != len(b) {
|
||||
return false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user