diff --git a/proxy/sensor/sensor.go b/proxy/sensor/sensor_service.go similarity index 53% rename from proxy/sensor/sensor.go rename to proxy/sensor/sensor_service.go index ae5fcef..c20ad84 100644 --- a/proxy/sensor/sensor.go +++ b/proxy/sensor/sensor_service.go @@ -12,9 +12,9 @@ type Sensor struct { Id json.Number `json:"id,Number,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"` Description string `json:"description,omitempty"` - MetaSensorStatus meta.MetaSensorStatus `json:"status,omitempty"` - Target target.Target `json:"target,omitempty"` - Crawler meta.MetaCrawler `json:"crawler,omitempty"` + MetaSensorStatus *meta.MetaSensorStatus `json:"status,omitempty"` + Target *target.Target `json:"target,omitempty"` + Crawler *meta.MetaCrawler `json:"crawler,omitempty"` CrawlerInputItems string `json:"crawlerInputItems,omitempty"` } @@ -25,23 +25,32 @@ func NewSensorService() *SensorService { return &SensorService{} } -func (ss *SensorService) Create(s *Sensor) (string, error) { - out, err := utils.InvokeDB("sensor", "create", s) - - if err != nil { - return "", err - } - return out, nil -} - -func (ss *SensorService) List(t *target.Target) (string, error) { - - out, err := utils.InvokeDBByModel("sensor", "findAllByTargetId", t, "com.loafle.overflow.target.model.Target") +func (ss *SensorService) Regist(s *Sensor) (string, error) { + out, err := utils.InvokeDBByModel("sensor", "save", s, utils.MODEL_SENSOR) if err != nil { return "", err } return out, nil - } + +func (ss *SensorService) 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 *SensorService) Read(id string) (string, error) { + out, err := utils.InvokeDBByModel("sensor", "findOne", id, utils.MODEL_LONG) + + if err != nil { + return "", err + } + + return out, nil +} \ No newline at end of file diff --git a/proxy/sensor/sensor_service_test.go b/proxy/sensor/sensor_service_test.go new file mode 100644 index 0000000..f3e5fbc --- /dev/null +++ b/proxy/sensor/sensor_service_test.go @@ -0,0 +1,64 @@ +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() + + p := &probe.Probe{} + p.Id = json.Number("1") + i := &infra.Infra{} + i.Id = json.Number("1") + status := &meta.MetaSensorStatus{ + Id: "2", + } + target := &target.Target{ + Id: "1", + } + crawler := &meta.MetaCrawler{ + Id: "2", + } + sensor := &Sensor{ + CreateDate: timestamp.Now(), + Description: "This is a Sensor", + MetaSensorStatus: status, + Target: target, + Crawler: crawler, + } + + res, err := ss.Regist(sensor) + if err != nil { + t.Fatal(err) + } + t.Log(res) + +} + +func TestSensorList(t *testing.T) { + ss := NewSensorService() + tar := &target.Target{ + Id: "1", + } + res, err := ss.ReadAllByTarget(tar) + if err != nil { + t.Fatal(err) + } + t.Log(res) +} + +func TestSensorRead(t *testing.T) { + ss := NewSensorService() + res, err := ss.Read("1") + if err != nil { + t.Fatal(err) + } + t.Log(res) +} diff --git a/proxy/sensor/sensor_test.go b/proxy/sensor/sensor_test.go deleted file mode 100644 index c46bd79..0000000 --- a/proxy/sensor/sensor_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package sensor - -import ( - "encoding/json" - "git.loafle.net/overflow/overflow_service/proxy/target" - "testing" -) - -func TestSensorService_List(t *testing.T) { - - ts := &target.Target{} - ts.Id = json.Number("1") - - ss := NewSensorService() - res, _ := ss.List(ts) - - t.Log(res) -} diff --git a/proxy/target/target_service.go b/proxy/target/target_service.go index d31455a..21f5189 100644 --- a/proxy/target/target_service.go +++ b/proxy/target/target_service.go @@ -49,7 +49,7 @@ func (t *TargetService) Regist(target *Target) (string, error) { func (t *TargetService) Read(id string) (string, error) { - out,err :=utils.InvokeDBByModel("target","findOne",id,utils.MODEL_LONG) + out, err := utils.InvokeDBByModel("target", "findOne", id, utils.MODEL_LONG) if err != nil { return "", err @@ -57,4 +57,3 @@ func (t *TargetService) Read(id string) (string, error) { return out, nil } - diff --git a/proxy/utils/model_mapping.go b/proxy/utils/model_mapping.go index 67cbe46..090f429 100644 --- a/proxy/utils/model_mapping.go +++ b/proxy/utils/model_mapping.go @@ -6,7 +6,7 @@ const ( MODEL_EMAIL_AUTH = "com.loafle.overflow.module.email.model" MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe" MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe" - MODEL_PROBE_TASK = "com.loafle.overflow.module.probe.model.ProbeTask" + MODEL_PROBE_TASK = "com.loafle.overflow.module.probe.model.ProbeTask" MODEL_INFRA = "com.loafle.overflow.module.infra.model.Infra" MODEL_INFRA_MACHINE = "com.loafle.overflow.module.infra.model.InfraMachine" MODEL_INFRA_HOST = "com.loafle.overflow.module.infra.model.InfraHost" @@ -16,6 +16,8 @@ const ( MODEL_INFRA_OS_PORT = "com.loafle.overflow.module.infra.model.InfraOSPort" MODEL_INFRA_SERVICE = "com.loafle.overflow.module.infra.model.InfraService" MODEL_TARGET = "com.loafle.overflow.module.target.model.Target" + MODEL_SENSOR = "com.loafle.overflow.module.sensor.model.Sensor" + MODEL_SENSOR_ITEM = "com.loafle.overflow.module.sensor.model.SensorItem" MODEL_STRING = "java.lang.String" MODEL_LONG = "java.lang.Long"