From 91dd79edc3178c9207e4a6524b5aae4af74b0a24 Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Mon, 26 Jun 2017 20:26:43 +0900 Subject: [PATCH] sensorItem --- proxy/meta/meta_sensor_item_type.go | 2 - proxy/sensor/sensor_item_service.go | 102 +++++++++++------------ proxy/sensor/sensor_item_service_test.go | 46 ++++------ 3 files changed, 67 insertions(+), 83 deletions(-) diff --git a/proxy/meta/meta_sensor_item_type.go b/proxy/meta/meta_sensor_item_type.go index 0bb4f87..e2452ef 100644 --- a/proxy/meta/meta_sensor_item_type.go +++ b/proxy/meta/meta_sensor_item_type.go @@ -11,5 +11,3 @@ type MetaSensorItemType struct { Description string `json:"description,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"` } - - diff --git a/proxy/sensor/sensor_item_service.go b/proxy/sensor/sensor_item_service.go index efecddb..696ebc8 100644 --- a/proxy/sensor/sensor_item_service.go +++ b/proxy/sensor/sensor_item_service.go @@ -1,54 +1,52 @@ package sensor -// -//import ( -// "encoding/json" -// "git.loafle.net/overflow/commons_go/model/timestamp" -// "git.loafle.net/overflow/overflow_service/proxy/meta" -// "git.loafle.net/overflow/overflow_service/proxy/target" -// "git.loafle.net/overflow/overflow_service/proxy/utils" -//) -// -//type sensorItem struct { -// Id json.Number `json:"id,Number,omitempty"` -// Sensor Sensor `json:"sensor,omitempty"` -// MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"` -// CreateDate timestamp.Timestamp `json:"createDate,omitempty"` -//} -// -//type sensorItemService struct { -//} -// -//func NewsensorItemService() *sensorItemService { -// return &sensorItemService{} -//} -// -//func (ss *sensorItemService) Regist(s *sensorItem) (string, error) { -// out, err := utils.InvokeDBByModel("sensor", "save", s, utils.MODEL_SENSOR) -// -// if err != nil { -// return "", err -// } -// -// return out, nil -//} -// -//func (ss *sensorItemService) ReadAllByTarget(t *target.Target) (string, error) { -// out, err := utils.InvokeDBByModel("sensor", "findAllByTarget", t, utils.MODEL_TARGET) -// -// if err != nil { -// return "", err -// } -// -// return out, err -//} -// -//func (ss *sensorItemService) Read(id string) (string, error) { -// out, err := utils.InvokeDBByModel("sensor", "findOne", id, utils.MODEL_LONG) -// -// if err != nil { -// return "", err -// } -// -// return out, nil -//} +import ( + "encoding/json" + "git.loafle.net/overflow/commons_go/model/timestamp" + "git.loafle.net/overflow/overflow_service/proxy/meta" + "git.loafle.net/overflow/overflow_service/proxy/utils" +) + +type SensorItem struct { + Id json.Number `json:"id,Number,omitempty"` + Sensor *Sensor `json:"sensor,omitempty"` + MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"` + CreateDate timestamp.Timestamp `json:"createDate,omitempty"` +} + +type SensorItemService struct { +} + +func NewSensorItemService() *SensorItemService { + return &SensorItemService{} +} + +func (ss *SensorItemService) Regist(s *SensorItem) (string, error) { + out, err := utils.InvokeDBByModel("sensorItem", "save", s, utils.MODEL_SENSOR_ITEM) + + if err != nil { + return "", err + } + + return out, nil +} + +func (ss *SensorItemService) ReadAllBySensor(s *Sensor) (string, error) { + out, err := utils.InvokeDBByModel("sensorItem", "findAllBySensor", s, utils.MODEL_SENSOR) + + if err != nil { + return "", err + } + + return out, err +} + +func (ss *SensorItemService) Read(id string) (string, error) { + out, err := utils.InvokeDBByModel("sensorItem", "findOne", id, utils.MODEL_LONG) + + if err != nil { + return "", err + } + + return out, nil +} diff --git a/proxy/sensor/sensor_item_service_test.go b/proxy/sensor/sensor_item_service_test.go index f3e5fbc..80db201 100644 --- a/proxy/sensor/sensor_item_service_test.go +++ b/proxy/sensor/sensor_item_service_test.go @@ -1,40 +1,28 @@ package sensor import ( - "encoding/json" "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_service/proxy/infra" "git.loafle.net/overflow/overflow_service/proxy/meta" - "git.loafle.net/overflow/overflow_service/proxy/probe" - "git.loafle.net/overflow/overflow_service/proxy/target" "testing" ) -func TestSensorRegist(t *testing.T) { - ss := NewSensorService() +func TestSensorItemRegist(t *testing.T) { + ss := NewSensorItemService() - p := &probe.Probe{} - p.Id = json.Number("1") - i := &infra.Infra{} - i.Id = json.Number("1") - status := &meta.MetaSensorStatus{ + s := &Sensor{ Id: "2", } - target := &target.Target{ - Id: "1", - } - crawler := &meta.MetaCrawler{ + metaItem := &meta.MetaSensorItem{ Id: "2", } - sensor := &Sensor{ - CreateDate: timestamp.Now(), - Description: "This is a Sensor", - MetaSensorStatus: status, - Target: target, - Crawler: crawler, + + item := &SensorItem{ + CreateDate: timestamp.Now(), + Sensor: s, + MetaSensorItem: metaItem, } - res, err := ss.Regist(sensor) + res, err := ss.Regist(item) if err != nil { t.Fatal(err) } @@ -42,21 +30,21 @@ func TestSensorRegist(t *testing.T) { } -func TestSensorList(t *testing.T) { - ss := NewSensorService() - tar := &target.Target{ +func TestSensorItemList(t *testing.T) { + ss := NewSensorItemService() + s := &Sensor{ Id: "1", } - res, err := ss.ReadAllByTarget(tar) + res, err := ss.ReadAllBySensor(s) if err != nil { t.Fatal(err) } t.Log(res) } -func TestSensorRead(t *testing.T) { - ss := NewSensorService() - res, err := ss.Read("1") +func TestSensorItemRead(t *testing.T) { + ss := NewSensorItemService() + res, err := ss.Read("2") if err != nil { t.Fatal(err) }