adding location to entries model, updating migrations, updating user-…

…show template
nyudlts · Jul 17, 2024 · 18785aa · 18785aa
1 parent da01cb5
commit 18785aa
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 5 deletions.
diff --git a/database/migrations.go b/database/migrations.go
@@ -1,6 +1,8 @@
 package database
 
 import (
+	"fmt"
+
 	"github.com/go-gormigrate/gormigrate/v2"
 	"github.com/nyudlts/go-medialog/config"
 	"github.com/nyudlts/go-medialog/models"
@@ -22,7 +24,8 @@ func MigrateDatabase(rollback bool, dbc config.DatabaseConfig) error {
 	if err := ConnectMySQL(dbc, true); err != nil {
 		return err
 	}
-	m := gormigrate.New(db, gormigrate.DefaultOptions, []*gormigrate.Migration{
+
+	migrations := []*gormigrate.Migration{
 		{
 			ID:       "20240710 - Adding First Name",
 			Migrate:  func(tx *gorm.DB) error { return tx.Migrator().AddColumn(&models.User{}, "FirstName") },
@@ -33,7 +36,14 @@ func MigrateDatabase(rollback bool, dbc config.DatabaseConfig) error {
 			Migrate:  func(tx *gorm.DB) error { return tx.Migrator().AddColumn(&models.User{}, "LastName") },
 			Rollback: func(tx *gorm.DB) error { return tx.Migrator().DropColumn(&models.User{}, "LastName") },
 		},
-	})
+		{
+			ID:       "20240717 - Adding location to entry",
+			Migrate:  func(tx *gorm.DB) error { return tx.Migrator().AddColumn(&models.Entry{}, "Location") },
+			Rollback: func(tx *gorm.DB) error { return tx.Migrator().DropColumn(&models.Entry{}, "Location") },
+		},
+	}
+
+	m := gormigrate.New(db, gormigrate.DefaultOptions, migrations)
 
 	if rollback {
 		if err := m.RollbackLast(); err != nil {
@@ -44,6 +54,16 @@ func MigrateDatabase(rollback bool, dbc config.DatabaseConfig) error {
 		if err := m.Migrate(); err != nil {
 			return err
 		}
+		dbMigrations := []string{}
+		if err := db.Table("migrations").Find(&dbMigrations).Error; err != nil {
+			fmt.Println(err.Error())
+		} else {
+			fmt.Println("DB Migration complete")
+			fmt.Println("Migrations currently applied")
+			for _, m := range dbMigrations {
+				fmt.Printf(" %s\n", m)
+			}
+		}
 		return nil
 	}
 }
diff --git a/models/models.go b/models/models.go
@@ -79,6 +79,7 @@ type Entry struct {
 	IsTransferred         bool       `json:"is_transferred"`
 	ContentType           string     `json:"content_type" form:"content_type"`
 	Structure             string     `json:"structure"`
+	Location              string     `json:"location" form:"location"`
 }
 
 func (e *Entry) UpdateEntry(updatedEntry Entry) {
@@ -144,8 +145,8 @@ type User struct {
 	UpdatedBy         int       `json:"updated_by"`
 	IsActive          bool      `json:"is_active"`
 	IsAdmin           bool      `json:"admin"`
-	CurrentIPAddress  string    `json: "current_ip_address"`
-	PreviousIPAddress string    `json: "previous_ip_address"`
+	CurrentIPAddress  string    `json:"current_ip_address"`
+	PreviousIPAddress string    `json:"previous_ip_address"`
 	FirstName         string    `json:"first_name" form:"first_name"`
 	LastName          string    `json:"last_name" form:"last_name"`
 }
diff --git a/templates/entries/entries-create.html b/templates/entries/entries-create.html
@@ -155,6 +155,12 @@ <h5 class="card-title">Image Data</h5>
                             </select>
                         </td>
                     </tr>
+                    <tr>
+                        <td class="col-sm-2"><strong>Storage Location</strong></td>
+                        <td class="col-sm-10">
+                            <input type="text" id="location" name="location"/>
+                        </td>
+                    </tr>
                     <tr>
                         <td class="col-sm-2"><strong>Interface</strong></td>
                         <td class="col-sm-10">

diff --git a/templates/entries/entries-edit.html b/templates/entries/entries-edit.html
@@ -170,6 +170,12 @@ <h5 class="card-title">Image Data</h5>
                             </select>
                         </td>
                     </tr>
+                    <tr>
+                        <td class="col-sm-2"><strong>Storage Location</strong></td>
+                        <td class="col-sm-10">
+                            <input type="text" id="location" name="location" value="{{ .entry.Location }}"/>
+                        </td>
+                    </tr>
                     <tr>
                         <td class="col-sm-2"><strong>Interface</strong></td>
                         <td class="col-sm-10">

diff --git a/templates/entries/entries-show.html b/templates/entries/entries-show.html
@@ -108,6 +108,10 @@ <h5 class="card-title">Image Data</h5>
                     <td class="col-sm-2"><strong>Image Format</strong></td>
                     <td class="col-sm-10">{{ .entry.ImageFormat }}</td>
                 </tr>
+                <tr>
+                    <td class="col-sm-2"><strong>Storage Location</strong></td>
+                    <td class="col-sm-10">{{ .entry.Location }}</td>
+                </tr>
                 <tr>
                     <td class="col-sm-2"><strong>Interface</strong></td>
                     <td class="col-sm-10">{{ .entry.Interface }}</td>

diff --git a/templates/users/users-index.html b/templates/users/users-index.html
@@ -39,7 +39,7 @@ <h3 class="card-title">Users</h3>
                         {{ else }}
                             <a href="/users/{{ $user.ID }}/remove_admin" class="btn-sm btn-danger" type="button"/>Remove Admin</a>
                         {{ end }}
-                        <a href="/users/{{ $user.ID}}/edit" class="btn btn-secondary">Edit</a>
+                        <a href="/users/{{ $user.ID}}/edit" class="btn-small btn-secondary">Edit</a>
                     </td>
                 </tr>
             </tbody>