fix: improve datatypes and sql types

backend/resize.go

@@ -30,7 +30,7 @@ func ResizeImage(env ProcessingEnvironment, imageId string) []error {
 	trackTimeSince(imageProcessDurationRead, startRead)
 
 	log.Printf("launching resize goroutines for %s", imageId)
-	errors := runMany(len(env.Config.Sizes), func(index int) error {
+	return runMany(len(env.Config.Sizes), func(index int) error {
 		definition := env.Config.Sizes[index]
 		path := filepath.Join(env.Config.TargetFolder, fmt.Sprintf("%s%s", imageId, definition.Suffix))
 		startClone := time.Now().UTC()
@@ -61,10 +61,4 @@ func ResizeImage(env ProcessingEnvironment, imageId string) []error {
 		log.Printf("done with image for %s in %v", imageId, definition)
 		return nil
 	})
-	if len(errors) == 0 {
-		if _, err = env.Database.Exec("UPDATE images SET metadata = $2 WHERE id = $1", imageId, originalImage.ParseMetadata()); err != nil {
-			return []error{err}
-		}
-	}
-	return errors
 }

frontend/errors.go

 package main
 
 import (
+	"git.kuschku.de/justjanne/imghost/shared"
 	"log"
 	"net/http"
 	"net/url"
@@ -8,7 +9,7 @@ import (
 
 type ErrorData struct {
 	Code  int
-	User  UserInfo
+	User  shared.UserInfo
 	URL   *url.URL
 	Error error
 }

frontend/migrations/001_images.up.sql

@@ -6,7 +6,6 @@ create table if not exists images
     description   text  default ''   not null,
     original_name text  default ''   not null,
     type          text               not null,
-    metadata      jsonb default '{}' not null,
     created_at    timestamp          not null,
     updated_at    timestamp          not null
 );

frontend/migrations/002_albums.up.sql

 create table if not exists albums
 (
-    id          text not null primary key,
-    owner       text,
-    title       text,
-    description text,
-    created_at  timestamp,
-    updated_at  timestamp
+    id          text            not null primary key,
+    owner       text            not null,
+    title       text default '' not null,
+    description text default '' not null,
+    created_at  timestamp       not null,
+    updated_at  timestamp       not null
 );
 
 create index if not exists albums_owner_index
@@ -16,4 +16,3 @@ create index if not exists albums_created_at_index
 
 create index if not exists albums_updated_at_index
     on albums (updated_at);
-

frontend/migrations/003_album_images.up.sql

 create table if not exists album_images
 (
-    album       text not null
+    album       text            not null
         constraint album_images_albums_id_fk
             references albums
             on update cascade on delete cascade,
-    image       text not null
+    image       text            not null
         constraint album_images_images_id_fk
             references images
             on update cascade on delete cascade,
-    title       text,
-    description text,
-    position    integer,
+    title       text default '' not null,
+    description text default '' not null,
+    position    integer         not null,
     constraint album_images_image_album_pk
         primary key (image, album)
 );
-

frontend/page_album_detail.go

 package main
 
 import (
+	"git.kuschku.de/justjanne/imghost/shared"
 	"net/http"
 	"path"
 )
 
 type AlbumDetailData struct {
-	User   UserInfo
-	Album  Album
+	User   shared.UserInfo
+	Album  shared.Album
 	IsMine bool
 }
 
 func pageAlbumDetail(env PageEnvironment) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		user := parseUser(r)
+		user := shared.ParseUser(r)
 
 		_, albumId := path.Split(r.URL.Path)
 		result, err := env.Database.Query(`
 			SELECT
 				id,
 				owner,
-				coalesce(title,  ''),
-				coalesce(description, ''),
-        		coalesce(created_at, to_timestamp(0))
+				title,
+				description,
+        		created_at
 			FROM albums
 			WHERE id = $1
 			`, albumId)
@@ -31,7 +32,7 @@ func pageAlbumDetail(env PageEnvironment) http.Handler {
 			return
 		}
 
-		var info Album
+		var info shared.Album
 		if result.Next() {
 			var owner string
 			err := result.Scan(&info.Id, &owner, &info.Title, &info.Description, &info.CreatedAt)
@@ -48,7 +49,7 @@ func pageAlbumDetail(env PageEnvironment) http.Handler {
 				position
 			FROM album_images
 			WHERE album = $1
-			ORDER BY position ASC
+			ORDER BY position
 			`, albumId)
 			if err != nil {
 				formatError(w, ErrorData{http.StatusInternalServerError, user, r.URL, err}, "html")
@@ -56,7 +57,7 @@ func pageAlbumDetail(env PageEnvironment) http.Handler {
 			}
 
 			for result.Next() {
-				var image AlbumImage
+				var image shared.AlbumImage
 				err := result.Scan(&image.Id, &owner, &image.Title, &image.Description, &image.Position)
 				if err != nil {
 					formatError(w, ErrorData{http.StatusInternalServerError, user, r.URL, err}, "html")

frontend/page_image_detail.go

@@ -10,7 +10,7 @@ import (
 )
 
 type ImageDetailData struct {
-	User    UserInfo
+	User    shared.UserInfo
 	Image   shared.Image
 	IsMine  bool
 	BaseUrl string
@@ -18,18 +18,18 @@ type ImageDetailData struct {
 
 func pageImageDetail(env PageEnvironment) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		user := parseUser(r)
+		user := shared.ParseUser(r)
 		_, imageId := path.Split(r.URL.Path)
 
 		result, err := env.Database.Query(`
 			SELECT
 				id,
 				owner,
-				coalesce(title,  ''),
-				coalesce(description, ''),
-        		coalesce(created_at, to_timestamp(0)),
-				coalesce(original_name, ''),
-				coalesce(type, '')
+				title,
+				description,
+				created_at,
+				original_name,
+				type
 			FROM images
 			WHERE id = $1
 			`, imageId)

frontend/page_image_list.go

@@ -9,7 +9,7 @@ import (
 )
 
 type ImageListData struct {
-	User     UserInfo
+	User     shared.UserInfo
 	Images   []shared.Image
 	Previous int64
 	Current  int64
@@ -18,16 +18,16 @@ type ImageListData struct {
 
 const PageSize = 30
 
-func paginateImageListQuery(env PageEnvironment, user UserInfo, offset int64, pageSize int) (*sql.Rows, error) {
+func paginateImageListQuery(env PageEnvironment, user shared.UserInfo, offset int64, pageSize int) (*sql.Rows, error) {
 	if offset == 0 {
 		return env.Database.Query(`
 			SELECT
 				id,
-				coalesce(title,  ''),
-				coalesce(description, ''),
-        		coalesce(created_at, to_timestamp(0)),
-				coalesce(original_name, ''),
-				coalesce(type, '')
+				title,
+				description,
+        		created_at,
+				original_name,
+				type
 			FROM images
 			WHERE owner = $1
 			ORDER BY created_at DESC
@@ -37,11 +37,11 @@ func paginateImageListQuery(env PageEnvironment, user UserInfo, offset int64, pa
 		return env.Database.Query(`
 			SELECT
 				id,
-				coalesce(title,  ''),
-				coalesce(description, ''),
-        		coalesce(created_at, to_timestamp(0)),
-				coalesce(original_name, ''),
-				coalesce(type, '')
+				title,
+				description,
+        		created_at,
+				original_name,
+				type
 			FROM images
 			WHERE owner = $1
 			ORDER BY created_at DESC
@@ -53,7 +53,7 @@ func paginateImageListQuery(env PageEnvironment, user UserInfo, offset int64, pa
 
 func pageImageList(ctx PageEnvironment) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		user := parseUser(r)
+		user := shared.ParseUser(r)
 		_, page := path.Split(r.URL.Path)
 		var pageNumber int64
 		pageNumber, err := strconv.ParseInt(page, 10, 64)

frontend/page_upload.go

@@ -17,7 +17,7 @@ import (
 
 type UploadData struct {
 	BaseUrl string
-	User    UserInfo
+	User    shared.UserInfo
 }
 
 func detectMimeType(path string) (string, error) {
@@ -35,11 +35,13 @@ func detectMimeType(path string) (string, error) {
 	return http.DetectContentType(buffer), nil
 }
 
-func generateId() string {
+func generateId() (string, error) {
 	buffer := make([]byte, 4)
-	rand.Read(buffer)
+	if _, err := rand.Read(buffer); err != nil {
+		return "", err
+	}
 
-	return base64.URLEncoding.WithPadding(base64.NoPadding).EncodeToString(buffer)
+	return base64.URLEncoding.WithPadding(base64.NoPadding).EncodeToString(buffer), nil
 }
 
 func writeBody(reader io.ReadCloser, path string) error {
@@ -57,11 +59,13 @@ func writeBody(reader io.ReadCloser, path string) error {
 }
 
 func createImage(config *shared.Config, body io.ReadCloser, fileHeader *multipart.FileHeader) (shared.Image, error) {
-	id := generateId()
+	id, err := generateId()
+	if err != nil {
+		return shared.Image{}, err
+	}
 	path := filepath.Join(config.SourceFolder, id)
 
-	err := writeBody(body, path)
-	if err != nil {
+	if err := writeBody(body, path); err != nil {
 		return shared.Image{}, err
 	}
 
@@ -82,7 +86,7 @@ func createImage(config *shared.Config, body io.ReadCloser, fileHeader *multipar
 func pageUpload(env PageEnvironment) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method == "POST" {
-			user := parseUser(r)
+			user := shared.ParseUser(r)
 
 			err := r.ParseMultipartForm(32 << 20)
 			if err != nil {
@@ -135,7 +139,7 @@ func pageUpload(env PageEnvironment) http.Handler {
 			}
 			return
 		} else {
-			user := parseUser(r)
+			user := shared.ParseUser(r)
 			if err := formatTemplate(w, "upload.html", UploadData{
 				env.Config.BaseUrl,
 				user,

frontend/model.go → shared/model.go

-package main
+package shared
 
 import (
+	"git.kuschku.de/justjanne/imghost/imgconv"
 	"net/http"
 	"strings"
 	"time"
@@ -13,7 +14,7 @@ type UserInfo struct {
 	Roles []string
 }
 
-func parseUser(r *http.Request) UserInfo {
+func ParseUser(r *http.Request) UserInfo {
 	return UserInfo{
 		r.Header.Get("X-Auth-Subject"),
 		r.Header.Get("X-Auth-Username"),
@@ -31,6 +32,22 @@ func (info UserInfo) HasRole(role string) bool {
 	return false
 }
 
+type Result struct {
+	Id       string           `json:"id"`
+	Success  bool             `json:"success"`
+	Errors   []string         `json:"errors"`
+	Metadata imgconv.Metadata `json:"metadata"`
+}
+
+type Image struct {
+	Id           string `json:"id"`
+	Title        string
+	Description  string
+	CreatedAt    time.Time
+	OriginalName string
+	MimeType     string `json:"mimeType"`
+}
+
 type AlbumImage struct {
 	Id          string
 	Title       string

shared/types.go

-package shared
-
-import (
-	"git.kuschku.de/justjanne/imghost/imgconv"
-	"time"
-)
-
-type Image struct {
-	Id           string `json:"id"`
-	Title        string
-	Description  string
-	CreatedAt    time.Time
-	OriginalName string
-	MimeType     string `json:"mimeType"`
-}
-
-type Result struct {
-	Id       string           `json:"id"`
-	Success  bool             `json:"success"`
-	Errors   []string         `json:"errors"`
-	Metadata imgconv.Metadata `json:"metadata"`
-}