refactor project structure by moving non business logic related code to adapters

Author: Yengas

pkg/config/config.go adapters/config/config.go

@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2020-02-21 11:58:17.562006 +0300 +03 m=+3.916537146
+// 2020-02-21 13:07:52.524624 +0300 +03 m=+3.952617600
 
 package docs
 
@@ -171,10 +171,7 @@ var doc = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/ingestion.DecimalMetricValue"
-                            }
+                            "$ref": "#/definitions/ingestion.DecimalMetricValueList"
                         }
                     }
                 ],
@@ -246,6 +243,12 @@ var doc = `{
                 }
             }
         },
+        "ingestion.DecimalMetricValueList": {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/ingestion.DecimalMetricValue"
+            }
+        },
         "registry.Device": {
             "type": "object",
             "properties": {

pkg/config/dynamic.go adapters/config/dynamic.go

@@ -156,10 +156,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/ingestion.DecimalMetricValue"
-                            }
+                            "$ref": "#/definitions/ingestion.DecimalMetricValueList"
                         }
                     }
                 ],
@@ -231,6 +228,12 @@
                 }
             }
         },
+        "ingestion.DecimalMetricValueList": {
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/ingestion.DecimalMetricValue"
+            }
+        },
         "registry.Device": {
             "type": "object",
             "properties": {

pkg/config/static.go adapters/config/static.go

@@ -25,6 +25,10 @@ definitions:
       value:
         type: number
     type: object
+  ingestion.DecimalMetricValueList:
+    items:
+      $ref: '#/definitions/ingestion.DecimalMetricValue'
+    type: array
   registry.Device:
     properties:
       firmware_version:
@@ -137,9 +141,7 @@ paths:
         name: metrics
         required: true
         schema:
-          items:
-            $ref: '#/definitions/ingestion.DecimalMetricValue'
-          type: array
+          $ref: '#/definitions/ingestion.DecimalMetricValueList'
       produces:
       - application/json
       responses:

pkg/http/auth.go adapters/http/auth.go

@@ -12,7 +12,7 @@ import (
 // @Tags metric
 // @Accept json
 // @Produce json
-// @Param metrics body []ingestion.DecimalMetricValue true "metrics to insert"
+// @Param metrics body ingestion.DecimalMetricValueList true "metrics to insert"
 // @Success 201 {string} string "inserted the temperature metrics"
 // @Failure 400 {string} string "invalid request parameters"
 // @Failure 401 {string} string "no device token supplied"

pkg/http/device/add_device.go adapters/http/device/add_device.go

@@ -6,11 +6,11 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/swaggo/gin-swagger"
 	"github.com/swaggo/gin-swagger/swaggerFiles"
+	http_device "iot-demo/adapters/http/device"
+	"iot-demo/adapters/http/docs"
+	http_health "iot-demo/adapters/http/health"
+	http_metrics "iot-demo/adapters/http/metrics"
 	add_device "iot-demo/pkg/device/add-device"
-	http_device "iot-demo/pkg/http/device"
-	"iot-demo/pkg/http/docs"
-	http_health "iot-demo/pkg/http/health"
-	http_metrics "iot-demo/pkg/http/metrics"
 	add_metrics "iot-demo/pkg/metrics/add-metrics"
 	query_metrics "iot-demo/pkg/metrics/query-metrics"
 	"log"

pkg/http/docs/docs.go adapters/http/docs/docs.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"context"
-	"iot-demo/pkg/config"
-	http_server "iot-demo/pkg/http"
+	"iot-demo/adapters/config"
+	http_server "iot-demo/adapters/http"
 	"log"
 	"net/http"
 	"os"

pkg/http/docs/swagger.json adapters/http/docs/swagger.json

@@ -4,15 +4,15 @@ package main
 
 import (
 	"github.com/google/wire"
-	"iot-demo/pkg/config"
+	"iot-demo/adapters/config"
+	http_server "iot-demo/adapters/http"
+	"iot-demo/adapters/jwt"
+	"iot-demo/adapters/storage/memory"
 	add_device "iot-demo/pkg/device/add-device"
 	"iot-demo/pkg/device/registry"
-	http_server "iot-demo/pkg/http"
-	"iot-demo/pkg/jwt"
 	add_metrics "iot-demo/pkg/metrics/add-metrics"
 	"iot-demo/pkg/metrics/ingestion"
 	query_metrics "iot-demo/pkg/metrics/query-metrics"
-	"iot-demo/pkg/storage/memory"
 )
 
 func NewJWTConfig(cfg config.Static) jwt.Config {

pkg/http/docs/swagger.yaml adapters/http/docs/swagger.yaml

@@ -1,5 +1,7 @@
 package ingestion
 
+type DecimalMetricValueList []*DecimalMetricValue
+
 type DecimalMetricValue struct {
 	Value float64 `json:"value"`
 	// Epoch timestamp in seconds