move models, views, and controllers to root
This commit is contained in:
parent
f0d29126ab
commit
96cc64464f
21 changed files with 190 additions and 203 deletions
14
api/track.go
14
api/track.go
|
@ -6,8 +6,8 @@ import (
|
|||
"net/http"
|
||||
|
||||
"arimelody-web/global"
|
||||
music "arimelody-web/music/controller"
|
||||
"arimelody-web/music/model"
|
||||
"arimelody-web/controller"
|
||||
"arimelody-web/model"
|
||||
)
|
||||
|
||||
type (
|
||||
|
@ -26,7 +26,7 @@ func ServeAllTracks() http.Handler {
|
|||
var tracks = []Track{}
|
||||
|
||||
var dbTracks = []*model.Track{}
|
||||
dbTracks, err := music.GetAllTracks(global.DB)
|
||||
dbTracks, err := controller.GetAllTracks(global.DB)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull tracks from DB: %s\n", err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
|
@ -50,7 +50,7 @@ func ServeAllTracks() http.Handler {
|
|||
|
||||
func ServeTrack(track *model.Track) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
dbReleases, err := music.GetTrackReleases(global.DB, track.ID, false)
|
||||
dbReleases, err := controller.GetTrackReleases(global.DB, track.ID, false)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to pull track releases for %s from DB: %s\n", track.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
|
@ -89,7 +89,7 @@ func CreateTrack() http.Handler {
|
|||
return
|
||||
}
|
||||
|
||||
id, err := music.CreateTrack(global.DB, &track)
|
||||
id, err := controller.CreateTrack(global.DB, &track)
|
||||
if err != nil {
|
||||
fmt.Printf("FATAL: Failed to create track: %s\n", err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
|
@ -120,7 +120,7 @@ func UpdateTrack(track *model.Track) http.Handler {
|
|||
return
|
||||
}
|
||||
|
||||
err = music.UpdateTrack(global.DB, track)
|
||||
err = controller.UpdateTrack(global.DB, track)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to update track %s: %s\n", track.ID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
|
@ -143,7 +143,7 @@ func DeleteTrack(track *model.Track) http.Handler {
|
|||
}
|
||||
|
||||
var trackID = r.URL.Path[1:]
|
||||
err := music.DeleteTrack(global.DB, trackID)
|
||||
err := controller.DeleteTrack(global.DB, trackID)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to delete track %s: %s\n", trackID, err)
|
||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue