diff --git a/proxy/crawler/crawler_service.go b/proxy/crawler/crawler_service.go index fb1ba3b..194c976 100644 --- a/proxy/crawler/crawler_service.go +++ b/proxy/crawler/crawler_service.go @@ -31,7 +31,7 @@ type Crawler struct { func (c *CrawlerService)List() string { - out := proxy.InvokeDB("crawler", "list", nil) + out := proxy.InvokeDB("crawler", "findAll", nil) return out } diff --git a/proxy/crawler/crawler_service_test.go b/proxy/crawler/crawler_service_test.go index ef223a3..29250c2 100644 --- a/proxy/crawler/crawler_service_test.go +++ b/proxy/crawler/crawler_service_test.go @@ -1,3 +1,14 @@ package crawler +import "testing" +func TestList(t *testing.T) { + + cs := NewCrawlerService() + + out := cs.List() + + + t.Log(out) + +} \ No newline at end of file diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go index 4e95dd3..c4855ea 100644 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go +++ b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service.go @@ -39,6 +39,16 @@ func (c *CrawlerInputItemMappingService)Create(ciim *CrawlerInputItemMapping) st } -func (c *CrawlerInputItemMappingService)Create(ciim *CrawlerInputItemMapping) string { +func (c *CrawlerInputItemMappingService)List(cr *crawler.Crawler) string { + + + out, err := utils.InvokeDBByModel("crawlerInputItemMapping", "findByCrawlerId", cr, "com.loafle.overflow.crawler.model.Crawler") + + if err != nil { + return "" + } + + + return out; } \ No newline at end of file diff --git a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go index ffcc3ca..4e29148 100644 --- a/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go +++ b/proxy/crawlerinputitemmapping/crawlerinputitemmapping_service_test.go @@ -1 +1,25 @@ package crawlerinputitemmapping + +import ( + "testing" + + "git.loafle.net/overflow/overflow_proxy_service/proxy/crawler" +) + +func TestListCrawler(t *testing.T) { + + + + niin := NewCrawlerInputItemMappingService() + + + cc := &crawler.Crawler{} + + cc.Id = "1"; + + out := niin.List(cc) + + + t.Log(out) + +} \ No newline at end of file diff --git a/proxy/utils/DBInvokeUtil.go b/proxy/utils/DBInvokeUtil.go index cd13f52..913f852 100644 --- a/proxy/utils/DBInvokeUtil.go +++ b/proxy/utils/DBInvokeUtil.go @@ -19,5 +19,22 @@ func InvokeDB( db string, method string, obj interface{}) (string, error) { out := proxy.InvokeDB(db, method, m) + return out, nil +} + +func InvokeDBByModel( db string, method string, obj interface{}, model string) (string, error) { + + bytes, err := json.Marshal(obj) + if err != nil { + return "", err + } + + m := make(map[string]string) + + m[model] = string(bytes) + + out := proxy.InvokeDB(db, method, m) + + return out, nil } \ No newline at end of file