More

internal/db/db.go

@@ -62,25 +62,3 @@ func (dbm *DBManager) bootstrapDatabase() {
         log.Fatal("[query] Unable to bootstrap database.")
     }
 }
-
-func (dbm *DBManager) ItemsFromAlbum(user models.User, album models.Album) []models.MediaItem {
-    var mediaItems []models.MediaItem
-    // db.Table("media_albums").
-    //     Select("media_item.*").
-    //     Joins("INNER JOIN media_items ON media_albums.ID = media_items.Albums").
-    //     Where("media_albums.album_id = ? AND media_items.User = ?", albumID, userID).
-
-
-    dbm.db.
-        //Where("album = ? AND user = ?", albumID, userID).
-        Find(&mediaItems)
-    return mediaItems
-
-    // db.Raw(`
-    //     SELECT
-    //         MediaItems.*
-    //     FROM
-    //         MediaAlbums
-    //     INNER JOIN MediaItems ON MediaAlbums.mediaID = MediaItems.mediaID
-    //     WHERE MediaAlbums.albumID = ? AND MediaItems.userID = ?`, albumID, userID)
-}

internal/db/devices.go

@@ -7,8 +7,8 @@ import (
     "reichard.io/imagini/internal/models"
 )
 
-func (dbm *DBManager) CreateDevice(device models.Device) (models.Device, error) {
-    log.Info("[query] Creating device: ", device.Name)
+func (dbm *DBManager) CreateDevice (device models.Device) (models.Device, error) {
+    log.Info("[db] Creating device: ", device.Name)
     device.RefreshKey = uuid.New().String()
     err := dbm.db.Create(&device).Error
     return device, err

internal/db/media_items.go

@@ -0,0 +1,35 @@
+package db
+
+import (
+    log "github.com/sirupsen/logrus"
+
+    "reichard.io/imagini/internal/models"
+)
+
+func (dbm *DBManager) CreateMediaItem (mediaItem models.MediaItem) (models.MediaItem, error) {
+    log.Info("[db] Creating media item: ", mediaItem.RelPath)
+    err := dbm.db.Create(&mediaItem).Error
+    return mediaItem, err
+}
+
+func (dbm *DBManager) MediaItemsFromAlbum(user models.User, album models.Album) ([]models.MediaItem, error) {
+    var mediaItems []models.MediaItem
+    // db.Table("media_albums").
+    //     Select("media_item.*").
+    //     Joins("INNER JOIN media_items ON media_albums.ID = media_items.Albums").
+    //     Where("media_albums.album_id = ? AND media_items.User = ?", albumID, userID).
+
+
+    err := dbm.db.
+        //Where("album = ? AND user = ?", albumID, userID).
+        Find(&mediaItems).Error
+    return mediaItems, err
+
+    // db.Raw(`
+    //     SELECT
+    //         MediaItems.*
+    //     FROM
+    //         MediaAlbums
+    //     INNER JOIN MediaItems ON MediaAlbums.mediaID = MediaItems.mediaID
+    //     WHERE MediaAlbums.albumID = ? AND MediaItems.userID = ?`, albumID, userID)
+}

internal/db/users.go

@@ -8,7 +8,7 @@ import (
 )
 
 func (dbm *DBManager) CreateUser(user models.User) (models.User, error) {
-    log.Info("[query] Creating user: ", user.Username)
+    log.Info("[db] Creating user: ", user.Username)
     hashedPassword, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
     if err != nil {
         log.Error(err)