From e27a7af285f083196dc63d8c413e8ff453459983 Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Mon, 26 Jun 2017 21:22:21 +0900 Subject: [PATCH] remove logic --- proxy/sensor/sensor_item_service.go | 12 +++++++++++- proxy/sensor/sensor_service.go | 10 ++++++++++ proxy/target/target_service.go | 11 +++++++++++ proxy/target/target_service_test.go | 13 +++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/proxy/sensor/sensor_item_service.go b/proxy/sensor/sensor_item_service.go index 696ebc8..e2e82c1 100644 --- a/proxy/sensor/sensor_item_service.go +++ b/proxy/sensor/sensor_item_service.go @@ -9,7 +9,7 @@ import ( type SensorItem struct { Id json.Number `json:"id,Number,omitempty"` - Sensor *Sensor `json:"sensor,omitempty"` + Sensor *Sensor `json:"sensor,omitempty"` MetaSensorItem *meta.MetaSensorItem `json:"item,omitempty"` CreateDate timestamp.Timestamp `json:"createDate,omitempty"` } @@ -50,3 +50,13 @@ func (ss *SensorItemService) Read(id string) (string, error) { return out, nil } + +func (ss *SensorItemService) Remove(s *SensorItem) (string, error) { + out, err := utils.InvokeDBByModel("sensorItem", "delete", s, utils.MODEL_SENSOR_ITEM) + + if err != nil { + return "", err + } + + return out, nil +} \ No newline at end of file diff --git a/proxy/sensor/sensor_service.go b/proxy/sensor/sensor_service.go index 144cf15..f2bdd81 100644 --- a/proxy/sensor/sensor_service.go +++ b/proxy/sensor/sensor_service.go @@ -54,3 +54,13 @@ func (ss *SensorService) Read(id string) (string, error) { return out, nil } + +func (ss *SensorService) Remove(s *Sensor) (string, error) { + out, err := utils.InvokeDBByModel("sensor", "delete", s, utils.MODEL_SENSOR) + + if err != nil { + return "", err + } + + return out, nil +} diff --git a/proxy/target/target_service.go b/proxy/target/target_service.go index 21f5189..f22e015 100644 --- a/proxy/target/target_service.go +++ b/proxy/target/target_service.go @@ -57,3 +57,14 @@ func (t *TargetService) Read(id string) (string, error) { return out, nil } + +func (t *TargetService) Remove(target *Target) (string, error) { + + out, err := utils.InvokeDBByModel("target", "delete", target, utils.MODEL_TARGET) + + if err != nil { + return "", err + } + + return out, nil +} \ No newline at end of file diff --git a/proxy/target/target_service_test.go b/proxy/target/target_service_test.go index eb9548f..7c6ca42 100644 --- a/proxy/target/target_service_test.go +++ b/proxy/target/target_service_test.go @@ -49,3 +49,16 @@ func TestTargetRead(t *testing.T) { } t.Log(res) } + + +func TestTargetDelete(t *testing.T) { + ts := NewTargetService() + target := &Target{ + Id:"1", + } + res, err := ts.Remove(target) + if err != nil { + t.Fatal(err) + } + t.Log(res) +}