Skip to content
Snippets Groups Projects
Commit a97d567f authored by Rémi PAILHAREY's avatar Rémi PAILHAREY :fork_knife_plate:
Browse files

feat: get most recent MonthlyReport 

+ updated response codes
parent 0a477ab4
Branches
No related tags found
3 merge requests!14feat: addprices + subject managment,!11feat: Add partners issue info,!5Feat: Add backoffice
Hide whitespace changes
Inline Side-by-side
Showing
with 351 additions and 39 deletions
docs/docs.go
+ 94
− 2
View file @ a97d567f
...@@ -75,10 +75,28 @@ var doc = `{ ...@@ -75,10 +75,28 @@ var doc = `{
], ],
"responses": { "responses": {
"200": { "200": {
"description": "OK", "description": "Updated successfully",
"schema": { "schema": {
"$ref": "#/definitions/monthlyNews.MonthlyNews" "$ref": "#/definitions/monthlyNews.MonthlyNews"
} }
},
"201": {
"description": "Created successfully",
"schema": {
"$ref": "#/definitions/monthlyNews.MonthlyNews"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
},
"500": {
"description": "Internal server error",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -147,6 +165,12 @@ var doc = `{ ...@@ -147,6 +165,12 @@ var doc = `{
"schema": { "schema": {
"$ref": "#/definitions/monthlyNews.MonthlyNews" "$ref": "#/definitions/monthlyNews.MonthlyNews"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -181,6 +205,12 @@ var doc = `{ ...@@ -181,6 +205,12 @@ var doc = `{
"schema": { "schema": {
"type": "string" "type": "string"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
} }
} }
} }
...@@ -232,10 +262,28 @@ var doc = `{ ...@@ -232,10 +262,28 @@ var doc = `{
], ],
"responses": { "responses": {
"200": { "200": {
"description": "OK", "description": "Updated successfully",
"schema": { "schema": {
"$ref": "#/definitions/poll.Poll" "$ref": "#/definitions/poll.Poll"
} }
},
"201": {
"description": "Created successfully",
"schema": {
"$ref": "#/definitions/poll.Poll"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
},
"500": {
"description": "Internal server error",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -304,6 +352,12 @@ var doc = `{ ...@@ -304,6 +352,12 @@ var doc = `{
"schema": { "schema": {
"$ref": "#/definitions/poll.Poll" "$ref": "#/definitions/poll.Poll"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -338,6 +392,38 @@ var doc = `{ ...@@ -338,6 +392,38 @@ var doc = `{
"schema": { "schema": {
"type": "string" "type": "string"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
}
}
}
},
"/api/common/monthlyReport": {
"get": {
"description": "Find the most recent MonthlyNews and try to find the corresponding poll if it exists",
"produces": [
"application/json"
],
"tags": [
"monthlyReport"
],
"summary": "Get details of the most recent monthlyReport",
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/monthlyReport.MonthlyReport"
}
},
"404": {
"description": "Not Found",
"schema": {
"type": "string"
}
} }
} }
} }
...@@ -374,6 +460,12 @@ var doc = `{ ...@@ -374,6 +460,12 @@ var doc = `{
"schema": { "schema": {
"$ref": "#/definitions/monthlyReport.MonthlyReport" "$ref": "#/definitions/monthlyReport.MonthlyReport"
} }
},
"404": {
"description": "Not Found",
"schema": {
"type": "string"
}
} }
} }
} }
......
docs/swagger.json
+ 94
− 2
View file @ a97d567f
...@@ -60,10 +60,28 @@ ...@@ -60,10 +60,28 @@
], ],
"responses": { "responses": {
"200": { "200": {
"description": "OK", "description": "Updated successfully",
"schema": { "schema": {
"$ref": "#/definitions/monthlyNews.MonthlyNews" "$ref": "#/definitions/monthlyNews.MonthlyNews"
} }
},
"201": {
"description": "Created successfully",
"schema": {
"$ref": "#/definitions/monthlyNews.MonthlyNews"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
},
"500": {
"description": "Internal server error",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -132,6 +150,12 @@ ...@@ -132,6 +150,12 @@
"schema": { "schema": {
"$ref": "#/definitions/monthlyNews.MonthlyNews" "$ref": "#/definitions/monthlyNews.MonthlyNews"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -166,6 +190,12 @@ ...@@ -166,6 +190,12 @@
"schema": { "schema": {
"type": "string" "type": "string"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
} }
} }
} }
...@@ -217,10 +247,28 @@ ...@@ -217,10 +247,28 @@
], ],
"responses": { "responses": {
"200": { "200": {
"description": "OK", "description": "Updated successfully",
"schema": { "schema": {
"$ref": "#/definitions/poll.Poll" "$ref": "#/definitions/poll.Poll"
} }
},
"201": {
"description": "Created successfully",
"schema": {
"$ref": "#/definitions/poll.Poll"
}
},
"400": {
"description": "Bad Request",
"schema": {
"type": "string"
}
},
"500": {
"description": "Internal server error",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -289,6 +337,12 @@ ...@@ -289,6 +337,12 @@
"schema": { "schema": {
"$ref": "#/definitions/poll.Poll" "$ref": "#/definitions/poll.Poll"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
} }
} }
}, },
...@@ -323,6 +377,38 @@ ...@@ -323,6 +377,38 @@
"schema": { "schema": {
"type": "string" "type": "string"
} }
},
"404": {
"description": "Not found",
"schema": {
"type": "string"
}
}
}
}
},
"/api/common/monthlyReport": {
"get": {
"description": "Find the most recent MonthlyNews and try to find the corresponding poll if it exists",
"produces": [
"application/json"
],
"tags": [
"monthlyReport"
],
"summary": "Get details of the most recent monthlyReport",
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/monthlyReport.MonthlyReport"
}
},
"404": {
"description": "Not Found",
"schema": {
"type": "string"
}
} }
} }
} }
...@@ -359,6 +445,12 @@ ...@@ -359,6 +445,12 @@
"schema": { "schema": {
"$ref": "#/definitions/monthlyReport.MonthlyReport" "$ref": "#/definitions/monthlyReport.MonthlyReport"
} }
},
"404": {
"description": "Not Found",
"schema": {
"type": "string"
}
} }
} }
} }
......
docs/swagger.yaml
+ 64
− 2
View file @ a97d567f
...@@ -98,9 +98,21 @@ paths: ...@@ -98,9 +98,21 @@ paths:
- application/json - application/json
responses: responses:
"200": "200":
description: OK description: Updated successfully
schema: schema:
$ref: '#/definitions/monthlyNews.MonthlyNews' $ref: '#/definitions/monthlyNews.MonthlyNews'
"201":
description: Created successfully
schema:
$ref: '#/definitions/monthlyNews.MonthlyNews'
"400":
description: Bad Request
schema:
type: string
"500":
description: Internal server error
schema:
type: string
summary: Create/update a specific monthlyNews' content summary: Create/update a specific monthlyNews' content
tags: tags:
- monthlyNews - monthlyNews
...@@ -125,6 +137,10 @@ paths: ...@@ -125,6 +137,10 @@ paths:
description: successful delete description: successful delete
schema: schema:
type: string type: string
"404":
description: Not found
schema:
type: string
summary: Delete a specific monthlyNews summary: Delete a specific monthlyNews
tags: tags:
- monthlyNews - monthlyNews
...@@ -148,6 +164,10 @@ paths: ...@@ -148,6 +164,10 @@ paths:
description: OK description: OK
schema: schema:
$ref: '#/definitions/monthlyNews.MonthlyNews' $ref: '#/definitions/monthlyNews.MonthlyNews'
"404":
description: Not found
schema:
type: string
summary: Get details of a specific monthlyNews summary: Get details of a specific monthlyNews
tags: tags:
- monthlyNews - monthlyNews
...@@ -202,9 +222,21 @@ paths: ...@@ -202,9 +222,21 @@ paths:
- application/json - application/json
responses: responses:
"200": "200":
description: OK description: Updated successfully
schema: schema:
$ref: '#/definitions/poll.Poll' $ref: '#/definitions/poll.Poll'
"201":
description: Created successfully
schema:
$ref: '#/definitions/poll.Poll'
"400":
description: Bad Request
schema:
type: string
"500":
description: Internal server error
schema:
type: string
summary: Update a specific poll' content summary: Update a specific poll' content
tags: tags:
- poll - poll
...@@ -229,6 +261,10 @@ paths: ...@@ -229,6 +261,10 @@ paths:
description: successful delete description: successful delete
schema: schema:
type: string type: string
"404":
description: Not found
schema:
type: string
summary: Delete a specific poll summary: Delete a specific poll
tags: tags:
- poll - poll
...@@ -252,9 +288,31 @@ paths: ...@@ -252,9 +288,31 @@ paths:
description: OK description: OK
schema: schema:
$ref: '#/definitions/poll.Poll' $ref: '#/definitions/poll.Poll'
"404":
description: Not found
schema:
type: string
summary: Get details of a specific poll summary: Get details of a specific poll
tags: tags:
- poll - poll
/api/common/monthlyReport:
get:
description: Find the most recent MonthlyNews and try to find the corresponding
poll if it exists
produces:
- application/json
responses:
"200":
description: OK
schema:
$ref: '#/definitions/monthlyReport.MonthlyReport'
"404":
description: Not Found
schema:
type: string
summary: Get details of the most recent monthlyReport
tags:
- monthlyReport
/api/common/monthlyReport/{year}/{month}: /api/common/monthlyReport/{year}/{month}:
get: get:
description: Get details of a specific monthlyReport description: Get details of a specific monthlyReport
...@@ -276,6 +334,10 @@ paths: ...@@ -276,6 +334,10 @@ paths:
description: OK description: OK
schema: schema:
$ref: '#/definitions/monthlyReport.MonthlyReport' $ref: '#/definitions/monthlyReport.MonthlyReport'
"404":
description: Not Found
schema:
type: string
summary: Get details of a specific monthlyReport summary: Get details of a specific monthlyReport
tags: tags:
- monthlyReport - monthlyReport
......
internal/database/database.go
+ 13
− 5
View file @ a97d567f
...@@ -37,7 +37,7 @@ func init() { ...@@ -37,7 +37,7 @@ func init() {
} }
} else { } else {
dsn := fmt.Sprintf("%v:%v@tcp(%v:3306)/%v?charset=utf8mb4&parseTime=True&loc=Local", dbUser, dbPassword, dbHost, dbName) dsn := fmt.Sprintf("%v:%v@tcp(%v:3306)/%v?charset=utf8mb4&parseTime=True&loc=Local", dbUser, dbPassword, dbHost, dbName)
log.Println(dsn) log.Printf("Data Source Name : %s", dsn)
db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{}) db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{})
if err != nil { if err != nil {
panic("failed to connect database") panic("failed to connect database")
...@@ -58,16 +58,24 @@ func Exists(year int, month int, contentType string) bool { ...@@ -58,16 +58,24 @@ func Exists(year int, month int, contentType string) bool {
func Get(year int, month int, contentType string) (MonthlyContent, error) { func Get(year int, month int, contentType string) (MonthlyContent, error) {
var monthlyContent MonthlyContent var monthlyContent MonthlyContent
if err := db.Where("year = ? AND month = ? AND content_type = ?", year, month, contentType).First(&monthlyContent).Error; err != nil { if err := db.Where("year = ? AND month = ? AND content_type = ?", year, month, contentType).First(&monthlyContent).Error; err != nil {
log.Println(monthlyContent) return MonthlyContent{}, err
}
return monthlyContent, nil
}
func GetMostRecent(contentType string) (MonthlyContent, error) {
var monthlyContent MonthlyContent
if err := db.Where("content_type = ?", contentType).Order("year desc, month desc").First(&monthlyContent).Error; err != nil {
return MonthlyContent{}, err return MonthlyContent{}, err
} }
return monthlyContent, nil return monthlyContent, nil
} }
func GetAll(contentType string) []MonthlyContent { func GetAll(contentType string) []MonthlyContent {
var monthlyContent []MonthlyContent var monthlyContents []MonthlyContent
db.Where("content_type = ?", contentType).Find(&monthlyContent) db.Where("content_type = ?", contentType).Find(&monthlyContents)
return monthlyContent return monthlyContents
} }
func Create(year int, month int, contentType string, content string) error { func Create(year int, month int, contentType string, content string) error {
......
internal/monthlyNews/monthlyNews.go
+ 8
− 4
View file @ a97d567f
...@@ -46,7 +46,6 @@ func GetAllMonthlyNews(w http.ResponseWriter, r *http.Request) { ...@@ -46,7 +46,6 @@ func GetAllMonthlyNews(w http.ResponseWriter, r *http.Request) {
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
log.Println(monthlyNews)
json.NewEncoder(w).Encode(monthlyNews) json.NewEncoder(w).Encode(monthlyNews)
log.Printf("| get all monthly news | %v", r.RemoteAddr) log.Printf("| get all monthly news | %v", r.RemoteAddr)
} }
...@@ -57,6 +56,7 @@ func GetAllMonthlyNews(w http.ResponseWriter, r *http.Request) { ...@@ -57,6 +56,7 @@ func GetAllMonthlyNews(w http.ResponseWriter, r *http.Request) {
// @Tags monthlyNews // @Tags monthlyNews
// @Produce json // @Produce json
// @Success 200 {object} MonthlyNews // @Success 200 {object} MonthlyNews
// @Failure 404 {string} string "Not found"
// @Param year path int true "Year of the monthlyNews" // @Param year path int true "Year of the monthlyNews"
// @Param month path int true "Month of the monthlyNews" // @Param month path int true "Month of the monthlyNews"
// @Router /api/admin/monthlyNews/{year}/{month} [get] // @Router /api/admin/monthlyNews/{year}/{month} [get]
...@@ -85,8 +85,8 @@ func GetSingleMonthlyNews(w http.ResponseWriter, r *http.Request) { ...@@ -85,8 +85,8 @@ func GetSingleMonthlyNews(w http.ResponseWriter, r *http.Request) {
header, errH := database.Get(year, month, "header") header, errH := database.Get(year, month, "header")
quote, errQ := database.Get(year, month, "quote") quote, errQ := database.Get(year, month, "quote")
if errH != nil || errQ != nil { if errH != nil || errQ != nil {
// If not found, answer empty json // If not found, answer "not found"
w.Write([]byte("{}")) w.WriteHeader(http.StatusNotFound)
return return
} }
monthlyNews := MonthlyNews{Year: year, Month: month, Header: header.Content, Quote: quote.Content} monthlyNews := MonthlyNews{Year: year, Month: month, Header: header.Content, Quote: quote.Content}
...@@ -140,7 +140,10 @@ func AddMonthlyNews(w http.ResponseWriter, r *http.Request) { ...@@ -140,7 +140,10 @@ func AddMonthlyNews(w http.ResponseWriter, r *http.Request) {
// @Tags monthlyNews // @Tags monthlyNews
// @Accept json // @Accept json
// @Produce json // @Produce json
// @Success 200 {object} MonthlyNews // @Success 200 {object} MonthlyNews "Updated successfully"
// @Success 201 {object} MonthlyNews "Created successfully"
// @Failure 400 {string} string "Bad Request"
// @Failure 500 {string} string "Internal server error"
// @Param monthlyNews body MonthlyNews true "MonthlyNews to create/update with new content" // @Param monthlyNews body MonthlyNews true "MonthlyNews to create/update with new content"
// @Router /api/admin/monthlyNews [put] // @Router /api/admin/monthlyNews [put]
func UpdateMonthlyNews(w http.ResponseWriter, r *http.Request) { func UpdateMonthlyNews(w http.ResponseWriter, r *http.Request) {
...@@ -204,6 +207,7 @@ func UpdateMonthlyNews(w http.ResponseWriter, r *http.Request) { ...@@ -204,6 +207,7 @@ func UpdateMonthlyNews(w http.ResponseWriter, r *http.Request) {
// @Tags monthlyNews // @Tags monthlyNews
// @Produce json // @Produce json
// @Success 200 {string} string "successful delete" // @Success 200 {string} string "successful delete"
// @Failure 404 {string} string "Not found"
// @Param year path int true "Year of the monthlyNews" // @Param year path int true "Year of the monthlyNews"
// @Param month path int true "Month of the monthlyNews" // @Param month path int true "Month of the monthlyNews"
// @Router /api/admin/monthlyNews/{year}/{month} [delete] // @Router /api/admin/monthlyNews/{year}/{month} [delete]
......
internal/monthlyReport/monthlyReport.go
+ 36
− 3
View file @ a97d567f
...@@ -2,7 +2,6 @@ package monthlyReport ...@@ -2,7 +2,6 @@ package monthlyReport
import ( import (
"encoding/json" "encoding/json"
"log"
"net/http" "net/http"
"strconv" "strconv"
...@@ -25,6 +24,7 @@ type MonthlyReport struct { ...@@ -25,6 +24,7 @@ type MonthlyReport struct {
// @Tags monthlyReport // @Tags monthlyReport
// @Produce json // @Produce json
// @Success 200 {object} MonthlyReport // @Success 200 {object} MonthlyReport
// @Failure 404 {string} string "Not found"
// @Param year path int true "Year of the monthlyReport" // @Param year path int true "Year of the monthlyReport"
// @Param month path int true "Month of the monthlyReport" // @Param month path int true "Month of the monthlyReport"
// @Router /api/common/monthlyReport/{year}/{month} [get] // @Router /api/common/monthlyReport/{year}/{month} [get]
...@@ -55,7 +55,8 @@ func GetSingleMonthlyReport(w http.ResponseWriter, r *http.Request) { ...@@ -55,7 +55,8 @@ func GetSingleMonthlyReport(w http.ResponseWriter, r *http.Request) {
link, errL := database.Get(year, month, "link") link, errL := database.Get(year, month, "link")
if errH != nil || errQuo != nil || errQue != nil || errL != nil { if errH != nil || errQuo != nil || errQue != nil || errL != nil {
http.Error(w, "couldn't find report", http.StatusNotFound) // If not found, answer empty json
w.WriteHeader(http.StatusNotFound)
return return
} }
...@@ -68,6 +69,38 @@ func GetSingleMonthlyReport(w http.ResponseWriter, r *http.Request) { ...@@ -68,6 +69,38 @@ func GetSingleMonthlyReport(w http.ResponseWriter, r *http.Request) {
Question: question.Content, Question: question.Content,
Link: link.Content, Link: link.Content,
} }
log.Println(monthlyReport) json.NewEncoder(w).Encode(monthlyReport)
}
// GetMostRecentMonthlyReport godoc
// @Summary Get details of the most recent monthlyReport
// @Description Find the most recent MonthlyNews and try to find the corresponding poll if it exists
// @Tags monthlyReport
// @Produce json
// @Success 200 {object} MonthlyReport
// @Failure 404 {string} string "Not found"
// @Router /api/common/monthlyReport [get]
func GetMostRecentMonthlyReport(w http.ResponseWriter, r *http.Request) {
header, errH := database.GetMostRecent("header")
quote, _ := database.Get(header.Year, header.Month, "quote")
question, _ := database.Get(header.Year, header.Month, "question")
link, _ := database.Get(header.Year, header.Month, "link")
if errH != nil {
// If not found, answer "not found"
w.WriteHeader(http.StatusNotFound)
return
}
w.Header().Set("Content-Type", "application/json")
monthlyReport := MonthlyReport{
Year: header.Year,
Month: header.Month,
Header: header.Content,
Quote: quote.Content,
Question: question.Content,
Link: link.Content,
}
json.NewEncoder(w).Encode(monthlyReport) json.NewEncoder(w).Encode(monthlyReport)
} }
internal/poll/poll.go
+ 8
− 4
View file @ a97d567f
...@@ -46,7 +46,6 @@ func GetAllPolls(w http.ResponseWriter, r *http.Request) { ...@@ -46,7 +46,6 @@ func GetAllPolls(w http.ResponseWriter, r *http.Request) {
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
log.Println(poll)
json.NewEncoder(w).Encode(poll) json.NewEncoder(w).Encode(poll)
log.Printf("| get all polls | %v", r.RemoteAddr) log.Printf("| get all polls | %v", r.RemoteAddr)
} }
...@@ -57,6 +56,7 @@ func GetAllPolls(w http.ResponseWriter, r *http.Request) { ...@@ -57,6 +56,7 @@ func GetAllPolls(w http.ResponseWriter, r *http.Request) {
// @Tags poll // @Tags poll
// @Produce json // @Produce json
// @Success 200 {object} Poll // @Success 200 {object} Poll
// @Failure 404 {string} string "Not found"
// @Param year path int true "Year of the poll" // @Param year path int true "Year of the poll"
// @Param month path int true "Month of the poll" // @Param month path int true "Month of the poll"
// @Router /api/admin/poll/{year}/{month} [get] // @Router /api/admin/poll/{year}/{month} [get]
...@@ -85,8 +85,8 @@ func GetSinglePoll(w http.ResponseWriter, r *http.Request) { ...@@ -85,8 +85,8 @@ func GetSinglePoll(w http.ResponseWriter, r *http.Request) {
question, errQ := database.Get(year, month, "question") question, errQ := database.Get(year, month, "question")
link, errL := database.Get(year, month, "link") link, errL := database.Get(year, month, "link")
if errQ != nil || errL != nil { if errQ != nil || errL != nil {
// If not found, answer empty json // If not found, answer "not found"
w.Write([]byte("{}")) w.WriteHeader(http.StatusNotFound)
return return
} }
poll := Poll{Year: year, Month: month, Question: question.Content, Link: link.Content} poll := Poll{Year: year, Month: month, Question: question.Content, Link: link.Content}
...@@ -140,7 +140,10 @@ func AddPoll(w http.ResponseWriter, r *http.Request) { ...@@ -140,7 +140,10 @@ func AddPoll(w http.ResponseWriter, r *http.Request) {
// @Tags poll // @Tags poll
// @Accept json // @Accept json
// @Produce json // @Produce json
// @Success 200 {object} Poll // @Success 200 {object} Poll "Updated successfully"
// @Success 201 {object} Poll "Created successfully"
// @Failure 400 {string} string "Bad Request"
// @Failure 500 {string} string "Internal server error"
// @Param poll body Poll true "Poll to update with new content" // @Param poll body Poll true "Poll to update with new content"
// @Router /api/admin/poll [put] // @Router /api/admin/poll [put]
func UpdatePoll(w http.ResponseWriter, r *http.Request) { func UpdatePoll(w http.ResponseWriter, r *http.Request) {
...@@ -204,6 +207,7 @@ func UpdatePoll(w http.ResponseWriter, r *http.Request) { ...@@ -204,6 +207,7 @@ func UpdatePoll(w http.ResponseWriter, r *http.Request) {
// @Tags poll // @Tags poll
// @Produce json // @Produce json
// @Success 200 {string} string "successful delete" // @Success 200 {string} string "successful delete"
// @Failure 404 {string} string "Not found"
// @Param year path int true "Year of the poll" // @Param year path int true "Year of the poll"
// @Param month path int true "Month of the poll" // @Param month path int true "Month of the poll"
// @Router /api/admin/poll/{year}/{month} [delete] // @Router /api/admin/poll/{year}/{month} [delete]
......
internal/rootmux/rootmux.go
+ 1
− 0
View file @ a97d567f
...@@ -36,6 +36,7 @@ func CreateRootMux(staticDir string) RootMux { ...@@ -36,6 +36,7 @@ func CreateRootMux(staticDir string) RootMux {
r.HandleFunc("/Logout", m.HandleLogout) r.HandleFunc("/Logout", m.HandleLogout)
r.Handle("/api/common/WhoAmI", auth.ValidateAuthMiddleware(auth.WhoAmI(), []string{"*"}, false)) r.Handle("/api/common/WhoAmI", auth.ValidateAuthMiddleware(auth.WhoAmI(), []string{"*"}, false))
r.HandleFunc("/api/common/monthlyReport", monthlyReport.GetMostRecentMonthlyReport).Methods(http.MethodGet)
r.HandleFunc("/api/common/monthlyReport/{year}/{month}", monthlyReport.GetSingleMonthlyReport).Methods(http.MethodGet) r.HandleFunc("/api/common/monthlyReport/{year}/{month}", monthlyReport.GetSingleMonthlyReport).Methods(http.MethodGet)
apiAdmin := r.PathPrefix("/api/admin").Subrouter() apiAdmin := r.PathPrefix("/api/admin").Subrouter()
......
internal/rootmux/rootmux_test.go
+ 33
− 17
View file @ a97d567f
...@@ -18,12 +18,14 @@ import ( ...@@ -18,12 +18,14 @@ import (
) )
var ( var (
oAuth2Server *httptest.Server oAuth2Server *httptest.Server
newMonthlyNews = monthlyNews.MonthlyNews{Year: 2020, Month: 0, Header: "newsHeader", Quote: "newsQuote"} newMonthlyNews = monthlyNews.MonthlyNews{Year: 2020, Month: 0, Header: "newsHeader", Quote: "newsQuote"}
newMonthlyNewsStr string newMonthlyNewsStr string
newPoll = poll.Poll{Year: 2020, Month: 0, Question: "pollQuestion", Link: "pollLink"} recentMonthlyNews = monthlyNews.MonthlyNews{Year: 2021, Month: 0, Header: "recentNewsHeader", Quote: "recentNewsQuote"}
newPollStr string recentMonthlyNewsStr string
noH map[string]string newPoll = poll.Poll{Year: 2020, Month: 0, Question: "pollQuestion", Link: "pollLink"}
newPollStr string
noH map[string]string
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
...@@ -51,6 +53,8 @@ func TestMain(m *testing.M) { ...@@ -51,6 +53,8 @@ func TestMain(m *testing.M) {
// Convert example objects to string // Convert example objects to string
newMonthlyNewsBytes, _ := json.Marshal(newMonthlyNews) newMonthlyNewsBytes, _ := json.Marshal(newMonthlyNews)
newMonthlyNewsStr = string(newMonthlyNewsBytes) newMonthlyNewsStr = string(newMonthlyNewsBytes)
recentMonthlyNewsBytes, _ := json.Marshal(recentMonthlyNews)
recentMonthlyNewsStr = string(recentMonthlyNewsBytes)
newPollBytes, _ := json.Marshal(newPoll) newPollBytes, _ := json.Marshal(newPoll)
newPollStr = string(newPollBytes) newPollStr = string(newPollBytes)
...@@ -94,10 +98,12 @@ func unloggedTests(t *testing.T) { ...@@ -94,10 +98,12 @@ func unloggedTests(t *testing.T) {
// Try to create a monthlyNews (must fail) // Try to create a monthlyNews (must fail)
do("POST", "/api/admin/monthlyNews", noH, newMonthlyNewsStr, http.StatusUnauthorized, "error extracting token") do("POST", "/api/admin/monthlyNews", noH, newMonthlyNewsStr, http.StatusUnauthorized, "error extracting token")
// Try to get the most recent monthlyReport (must fail because not found)
do("GET", "/api/common/monthlyReport", noH, "", http.StatusNotFound, "")
} }
/** /**
ADMIN TESTS (this tests are to check that an administrator can alter the apps) ADMIN TESTS (this tests are to check that an administrator can edit a newsletter's content)
**/ **/
func adminTests(t *testing.T) { func adminTests(t *testing.T) {
// Create the tester // Create the tester
...@@ -113,35 +119,45 @@ func adminTests(t *testing.T) { ...@@ -113,35 +119,45 @@ func adminTests(t *testing.T) {
do("POST", "/api/admin/monthlyNews", noH, newMonthlyNewsStr, http.StatusUnauthorized, "XSRF protection triggered") do("POST", "/api/admin/monthlyNews", noH, newMonthlyNewsStr, http.StatusUnauthorized, "XSRF protection triggered")
// Try to create a monthly news without body (must fail) // Try to create a monthly news without body (must fail)
do("POST", "/api/admin/monthlyNews", xsrfHeader, "", http.StatusBadRequest, "request body is empty") do("POST", "/api/admin/monthlyNews", xsrfHeader, "", http.StatusBadRequest, "request body is empty")
// Try to get a monthly news before it is created (must pass empty) // Try to get a monthly news before it is created (must fail because not found)
do("GET", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusOK, "{}") do("GET", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusNotFound, "")
// Try to create a monthly news (must pass) // Try to create a monthly news (must pass)
do("PUT", "/api/admin/monthlyNews", xsrfHeader, newMonthlyNewsStr, http.StatusCreated, newMonthlyNewsStr) do("PUT", "/api/admin/monthlyNews", xsrfHeader, newMonthlyNewsStr, http.StatusCreated, newMonthlyNewsStr)
// Try to update a monthly news (must pass) // Try to update a monthly news (must pass)
do("PUT", "/api/admin/monthlyNews", xsrfHeader, newMonthlyNewsStr, http.StatusOK, newMonthlyNewsStr) do("PUT", "/api/admin/monthlyNews", xsrfHeader, newMonthlyNewsStr, http.StatusOK, newMonthlyNewsStr)
// Try to get the monthly news created (must pass) // Try to get the monthly news created (must pass)
do("GET", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusOK, newMonthlyNewsStr) do("GET", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusOK, newMonthlyNewsStr)
// Try to delete the monthly news created (must pass) // Try to get the most recent monthlyReport (must pass)
do("DELETE", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusOK, "successful delete") do("GET", "/api/common/monthlyReport", noH, "", http.StatusOK, `{"year":2020,"month":0,"header":"newsHeader","quote":"newsQuote","question":"","link":""`)
// Try to get a monthly news after it is deleted (must pass empty)
do("GET", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusOK, "{}")
// Try to create a poll without the XSRF-TOKEN (must fail) // Try to create a poll without the XSRF-TOKEN (must fail)
do("POST", "/api/admin/poll", noH, newPollStr, http.StatusUnauthorized, "XSRF protection triggered") do("POST", "/api/admin/poll", noH, newPollStr, http.StatusUnauthorized, "XSRF protection triggered")
// Try to create a poll without body (must fail) // Try to create a poll without body (must fail)
do("POST", "/api/admin/poll", xsrfHeader, "", http.StatusBadRequest, "request body is empty") do("POST", "/api/admin/poll", xsrfHeader, "", http.StatusBadRequest, "request body is empty")
// Try to get a poll before it is created (must pass empty) // Try to get a poll before it is created (must fail because not found')
do("GET", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusOK, "{}") do("GET", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusNotFound, "")
// Try to create a poll (must pass) // Try to create a poll (must pass)
do("PUT", "/api/admin/poll", xsrfHeader, newPollStr, http.StatusCreated, newPollStr) do("PUT", "/api/admin/poll", xsrfHeader, newPollStr, http.StatusCreated, newPollStr)
// Try to update a poll (must pass) // Try to update a poll (must pass)
do("PUT", "/api/admin/poll", xsrfHeader, newPollStr, http.StatusOK, newPollStr) do("PUT", "/api/admin/poll", xsrfHeader, newPollStr, http.StatusOK, newPollStr)
// Try to get the poll created (must pass) // Try to get the poll created (must pass)
do("GET", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusOK, newPollStr) do("GET", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusOK, newPollStr)
// Try to get the most recent monthlyReport (must pass)
do("GET", "/api/common/monthlyReport", noH, "", http.StatusOK, `{"year":2020,"month":0,"header":"newsHeader","quote":"newsQuote","question":"pollQuestion","link":"pollLink"`)
// Try to create a monthly news (must pass)
do("POST", "/api/admin/monthlyNews", xsrfHeader, recentMonthlyNewsStr, http.StatusCreated, recentMonthlyNewsStr)
// Try to get the most recent monthlyReport (must pass)
do("GET", "/api/common/monthlyReport", noH, "", http.StatusOK, `{"year":2021,"month":0,"header":"recentNewsHeader","quote":"recentNewsQuote","question":"","link":""`)
// Try to delete the monthly news created (must pass)
do("DELETE", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusOK, "successful delete")
// Try to get a monthly news after it is deleted (must fail because not found)
do("GET", "/api/admin/monthlyNews/2020/0", xsrfHeader, "", http.StatusNotFound, "")
// Try to delete the poll created (must pass) // Try to delete the poll created (must pass)
do("DELETE", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusOK, "successful delete") do("DELETE", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusOK, "successful delete")
// Try to get a poll after it is deleted (must pass empty) // Try to get a poll after it is deleted (must fail because not found)
do("GET", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusOK, "{}") do("GET", "/api/admin/poll/2020/0", xsrfHeader, "", http.StatusNotFound, "")
} }
// Try to login (must pass) // Try to login (must pass)
do("GET", "/OAuth2Login", noH, "", http.StatusOK, "successful login") do("GET", "/OAuth2Login", noH, "", http.StatusOK, "successful login")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment