socialnetworknews-api

commit e0ea8b4332bbeca1e96980450ba6de56ea81d9ba
parent 57f269698e11257e6d2d8ac6c0edacbbd526ea20
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 13 Mar 2018 19:36:34 +0100

Fix error

Diffstat:
M
api/webserver.go
 | 
18
+++++++++++++++---
D
errors/tweets.go
 | 
14
--------------

2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/api/webserver.go b/api/webserver.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/SocialNetworkNews/SocialNetworkNews_API/config"
 	"github.com/SocialNetworkNews/SocialNetworkNews_API/db"
-	ownErrors "github.com/SocialNetworkNews/SocialNetworkNews_API/errors"
 	"github.com/SocialNetworkNews/SocialNetworkNews_API/twitter"
 	"github.com/dgraph-io/badger"
 	"github.com/gorilla/mux"
@@ -20,6 +19,19 @@ import (
 	"time"
 )
 
+type TweetsError struct {
+	err        string //error description
+	statusCode int    // HTTP Code
+}
+
+func (e *TweetsError) Error() string {
+	return e.err
+}
+
+func (e *TweetsError) StatusCode() int {
+	return e.statusCode
+}
+
 func Yesterday(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	//TODO Use Database or File Structure (probably File Structure)
@@ -28,7 +40,7 @@ func Yesterday(w http.ResponseWriter, r *http.Request) {
 
 	tweets, err := getTweets()
 	if err != nil {
-		if tErr, ok := err.(*ownErrors.TweetsError); ok {
+		if tErr, ok := err.(*TweetsError); ok {
 			http.Error(w, tErr.Error(), tErr.StatusCode())
 		} else {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -266,7 +278,7 @@ func getTweets() ([]byte, error) {
 
 	fo, err := os.Open(dataFilePath)
 	if err != nil {
-		return nil, &ownErrors.TweetsError{err.Error(), 404}
+		return nil, &TweetsError{err.Error(), 404}
 	}
 
 	// close fo on exit and check for its returned error
diff --git a/errors/tweets.go b/errors/tweets.go
@@ -1,14 +0,0 @@
-package errors
-
-type TweetsError struct {
-	err        string //error description
-	statusCode int    // HTTP Code
-}
-
-func (e *TweetsError) Error() string {
-	return e.err
-}
-
-func (e *TweetsError) StatusCode() int {
-	return e.statusCode
-}