Feature/backend (#101)

* move backend code #99

* adjust drone build for backend subdir

* move .rest to backend

.drone.yml

@@ -7,7 +7,7 @@ pipeline:
   build:
     image: golang:1.10-alpine
     commands:
-      - cd app
+      - cd backend/app
       - go build -v ./...
 
   docker_master:

Dockerfile

@@ -15,10 +15,9 @@ ARG TRAVIS_TAG
 ARG DRONE_TAG
 ARG DRONE_COMMIT
 
-WORKDIR /go/src/github.com/umputun/remark
+WORKDIR /go/src/github.com/umputun/remark/backend
 
-ADD app /go/src/github.com/umputun/remark/app
-ADD vendor /go/src/github.com/umputun/remark/vendor
+ADD backend /go/src/github.com/umputun/remark/backend
 ADD .git /go/src/github.com/umputun/remark/.git
 
 RUN cd app && go test ./...
@@ -66,7 +65,7 @@ ADD start.sh /srv/start.sh
 
 RUN chmod +x /srv/start.sh /srv/import-disqus.sh /srv/restore-backup.sh /srv/migrate-data.sh /srv/create-backup.sh
 
-COPY --from=build-backend /go/src/github.com/umputun/remark/remark /srv/
+COPY --from=build-backend /go/src/github.com/umputun/remark/backend/remark /srv/
 COPY --from=build-frontend /srv/web/public/ /srv/web
 RUN chown -R app:app /srv
 

backend/app/main.go

@@ -17,13 +17,13 @@ import (
 	"github.com/jessevdk/go-flags"
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/migrator"
-	"github.com/umputun/remark/app/rest/api"
-	"github.com/umputun/remark/app/rest/auth"
-	"github.com/umputun/remark/app/rest/cache"
-	"github.com/umputun/remark/app/rest/proxy"
-	"github.com/umputun/remark/app/store/engine"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/migrator"
+	"github.com/umputun/remark/backend/app/rest/api"
+	"github.com/umputun/remark/backend/app/rest/auth"
+	"github.com/umputun/remark/backend/app/rest/cache"
+	"github.com/umputun/remark/backend/app/rest/proxy"
+	"github.com/umputun/remark/backend/app/store/engine"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 // Opts with command line flags and env

backend/app/main_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	flags "github.com/jessevdk/go-flags"
+	"github.com/jessevdk/go-flags"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -118,6 +118,7 @@ func prepApp(t *testing.T, port int, duration time.Duration) (*Application, cont
 	opts.Auth.Facebook.CSEC, opts.Auth.Facebook.CID = "csec", "cid"
 	opts.Auth.Yandex.CSEC, opts.Auth.Yandex.CID = "csec", "cid"
 	opts.Port = port
+	opts.BackupLocation = "/tmp"
 
 	os.Remove(opts.Store.Bolt.Path + "/remark.db")
 

backend/app/migrator/disqus.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Disqus implements Importer from disqus xml

backend/app/migrator/disqus_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/coreos/bbolt"
 	"github.com/stretchr/testify/require"
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/engine"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/engine"
+	"github.com/umputun/remark/backend/app/store/service"
 
 	"github.com/stretchr/testify/assert"
 )

backend/app/migrator/migrator.go

@@ -9,7 +9,7 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Importer defines interface to convert posts from external sources

backend/app/migrator/migrator_test.go

@@ -8,9 +8,9 @@ import (
 	"github.com/coreos/bbolt"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/store/service"
 
-	"github.com/umputun/remark/app/store/engine"
+	"github.com/umputun/remark/backend/app/store/engine"
 )
 
 func TestMigrator_ImportDisqus(t *testing.T) {

backend/app/migrator/remark.go

@@ -8,7 +8,7 @@ import (
 	"log"
 
 	"github.com/pkg/errors"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Remark implements exporter and importer for internal store format

backend/app/migrator/remark_test.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/coreos/bbolt"
 	"github.com/stretchr/testify/assert"
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/engine"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/engine"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 var testDb = "/tmp/test-remark.db"

backend/app/rest/api/admin.go

@@ -11,13 +11,13 @@ import (
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"
-	"github.com/umputun/remark/app/rest/auth"
+	"github.com/umputun/remark/backend/app/rest/auth"
 
-	"github.com/umputun/remark/app/migrator"
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/cache"
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/migrator"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/cache"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 // admin provides router for all requests available for admin users only

backend/app/rest/api/admin_test.go

@@ -13,8 +13,8 @@ import (
 	"github.com/dgrijalva/jwt-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/umputun/remark/app/rest/auth"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest/auth"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestAdmin_Delete(t *testing.T) {

backend/app/rest/api/middleware.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/go-chi/chi/middleware"
 
-	"github.com/umputun/remark/app/rest"
+	"github.com/umputun/remark/backend/app/rest"
 )
 
 // JSON is a map alias, just for convenience

backend/app/rest/api/middleware_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/go-chi/chi"
 	"github.com/stretchr/testify/assert"
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/store"
 
 	"github.com/stretchr/testify/require"
 )

backend/app/rest/api/migrator.go

@@ -16,9 +16,9 @@ import (
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/render"
 
-	"github.com/umputun/remark/app/migrator"
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/cache"
+	"github.com/umputun/remark/backend/app/migrator"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/cache"
 )
 
 // Migrator rest runs on unexposed port and available for local requests only
@@ -55,8 +55,10 @@ func (m *Migrator) Shutdown() {
 	defer cancel()
 
 	m.lock.Lock()
-	if err := m.httpServer.Shutdown(ctx); err != nil {
-		log.Printf("[DEBUG] importer shutdown error, %s", err)
+	if m.httpServer != nil {
+		if err := m.httpServer.Shutdown(ctx); err != nil {
+			log.Printf("[DEBUG] importer shutdown error, %s", err)
+		}
 	}
 	m.lock.Unlock()
 

backend/app/rest/api/migrator_test.go

@@ -14,9 +14,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/migrator"
-	"github.com/umputun/remark/app/store/engine"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/migrator"
+	"github.com/umputun/remark/backend/app/store/engine"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 func TestMigrator_Import(t *testing.T) {

backend/app/rest/api/rest.go

@@ -19,13 +19,13 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/russross/blackfriday.v2"
 
-	"github.com/umputun/remark/app/migrator"
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/auth"
-	"github.com/umputun/remark/app/rest/cache"
-	"github.com/umputun/remark/app/rest/proxy"
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/migrator"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/auth"
+	"github.com/umputun/remark/backend/app/rest/cache"
+	"github.com/umputun/remark/backend/app/rest/proxy"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 // Rest is a rest access server
@@ -92,8 +92,10 @@ func (s *Rest) Shutdown() {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 	s.lock.Lock()
-	if err := s.httpServer.Shutdown(ctx); err != nil {
-		log.Printf("[DEBUG] rest shutdown error, %s", err)
+	if s.httpServer != nil {
+		if err := s.httpServer.Shutdown(ctx); err != nil {
+			log.Printf("[DEBUG] rest shutdown error, %s", err)
+		}
 	}
 	log.Print("[DEBUG] shutdown rest server completed")
 	s.lock.Unlock()

backend/app/rest/api/rest_private.go

@@ -16,10 +16,10 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	blackfriday "gopkg.in/russross/blackfriday.v2"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/auth"
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/auth"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 // POST /comment - adds comment, resets all immutable fields

backend/app/rest/api/rest_private_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestRest_Create(t *testing.T) {

backend/app/rest/api/rest_public.go

@@ -12,9 +12,9 @@ import (
 	"github.com/go-chi/render"
 	blackfriday "gopkg.in/russross/blackfriday.v2"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/cache"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/cache"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // GET /find?site=siteID&url=post-url&format=[tree|plain]&sort=[+/-time|+/-score]

backend/app/rest/api/rest_public_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestRest_Ping(t *testing.T) {

backend/app/rest/api/rest_test.go

@@ -15,12 +15,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/migrator"
-	"github.com/umputun/remark/app/rest/auth"
-	"github.com/umputun/remark/app/rest/proxy"
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/engine"
-	"github.com/umputun/remark/app/store/service"
+	"github.com/umputun/remark/backend/app/migrator"
+	"github.com/umputun/remark/backend/app/rest/auth"
+	"github.com/umputun/remark/backend/app/rest/proxy"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/engine"
+	"github.com/umputun/remark/backend/app/store/service"
 )
 
 var testDb = "/tmp/test-remark.db"

backend/app/rest/api/rss.go

@@ -9,9 +9,9 @@ import (
 	"github.com/go-chi/chi"
 	"github.com/gorilla/feeds"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/cache"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/cache"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 const maxRssItems = 20

backend/app/rest/api/rss_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestServer_RssPost(t *testing.T) {

backend/app/rest/auth/auth.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Authenticator is top level auth object providing middlewares

backend/app/rest/auth/jwt.go

@@ -7,7 +7,7 @@ import (
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // JWT wraps jwt operations

backend/app/rest/auth/jwt_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 var testJwtValid = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjI3ODkxOTE4MjIsImp0aSI6InJhbmRvbSBpZCI" +

backend/app/rest/auth/provider.go

@@ -16,9 +16,9 @@ import (
 	"github.com/go-chi/render"
 	"golang.org/x/oauth2"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/rest/proxy"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/rest/proxy"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Provider represents oauth2 provider

backend/app/rest/auth/provider_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestLogin(t *testing.T) {

backend/app/rest/auth/providers.go

@@ -9,7 +9,7 @@ import (
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/yandex"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // NewGoogle makes google oauth2 provider

backend/app/rest/auth/providers_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestProviders_NewGoogle(t *testing.T) {

backend/app/rest/cache/cache.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/umputun/remark/app/rest"
+	"github.com/umputun/remark/backend/app/rest"
 )
 
 // LoadingCache defines interface for caching

backend/app/rest/cache/cache_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestCache_Keys(t *testing.T) {

backend/app/rest/httperrors_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestSendErrorJSON(t *testing.T) {

backend/app/rest/proxy/avatar.go

@@ -11,8 +11,8 @@ import (
 	"github.com/go-chi/chi"
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/rest"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/rest"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Avatar provides file-system store and http handler for avatars

backend/app/rest/proxy/avatar_store.go

@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/image/draw"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // AvatarStore defines interface to store and serve avatars

backend/app/rest/proxy/avatar_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestAvatar_Put(t *testing.T) {

backend/app/rest/proxy/image.go

@@ -11,7 +11,7 @@ import (
 	"github.com/PuerkitoBio/goquery"
 	"github.com/go-chi/chi"
 	"github.com/pkg/errors"
-	"github.com/umputun/remark/app/rest"
+	"github.com/umputun/remark/backend/app/rest"
 )
 
 // Image extracts image src from comment's html and provides proxy for them

backend/app/rest/tree.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Tree is formatter making tree from the list of comments

backend/app/rest/tree_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestMakeTree(t *testing.T) {

backend/app/rest/user.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 type contextKey string

backend/app/rest/user_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestGetUserInfo(t *testing.T) {

backend/app/store/engine/bolt_accessor.go

@@ -10,7 +10,7 @@ import (
 	"github.com/coreos/bbolt"
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // BoltDB implements store.Interface, represents multiple sites with multiplexing to different bolt dbs. Thread safe.

backend/app/store/engine/bolt_accessor_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 var testDb = "test-remark.db"

backend/app/store/engine/bolt_admin.go

@@ -8,7 +8,7 @@ import (
 	"github.com/coreos/bbolt"
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 // Delete removes comment, by locator from the store.

backend/app/store/engine/bolt_admin_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestBoltAdmin_Delete(t *testing.T) {

backend/app/store/engine/engine.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 //go:generate sh -c "mockery -inpkg -name Interface -print > file.tmp && mv file.tmp engine_mock.go"

backend/app/store/engine/engine_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/umputun/remark/app/store"
+	"github.com/umputun/remark/backend/app/store"
 )
 
 func TestEngine_sortComments(t *testing.T) {

backend/app/store/service/service.go

@@ -7,8 +7,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/engine"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/engine"
 )
 
 // DataStore wraps store.Interface with additional methods

backend/app/store/service/service_test.go

@@ -14,8 +14,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/umputun/remark/app/store"
-	"github.com/umputun/remark/app/store/engine"
+	"github.com/umputun/remark/backend/app/store"
+	"github.com/umputun/remark/backend/app/store/engine"
 )
 
 var testDb = "/tmp/test-remark.db"