diff --git a/api/app/app.go b/api/app/app.go index 1c8dd9c..9b4972b 100644 --- a/api/app/app.go +++ b/api/app/app.go @@ -24,7 +24,7 @@ import ( func New() *fiber.App { // Setup Context - ctx, cancel := context.WithTimeout(context.Background(), time.Minute*1) + ctx, cancel := context.WithCancel(context.Background()) // Setup PostgreSQL poolConfig, err := pgxpool.ParseConfig(os.Getenv("DATABASE_URL")) @@ -62,15 +62,14 @@ func New() *fiber.App { Debug: true, }) if err != nil { - log.Fatal(err) + log.Fatalln(err) } - defer sentry.Flush(2 * time.Second) err = database.Setup(db, &ctx) if err != nil { sentry.CaptureException(err) - log.Fatal(err) + log.Fatalln(err) } err = core.SetAllJSONJoke(db, memory, &ctx) diff --git a/api/app/handler/joke/joke_add.go b/api/app/handler/joke/joke_add.go index 6dec1a8..f5ae547 100644 --- a/api/app/handler/joke/joke_add.go +++ b/api/app/handler/joke/joke_add.go @@ -3,7 +3,9 @@ package joke import ( "jokes-bapak2-api/app/core" + "github.com/Masterminds/squirrel" "github.com/gofiber/fiber/v2" + "github.com/jackc/pgx/v4" ) func (d *Dependencies) AddNewJoke(c *fiber.Ctx) error { @@ -38,8 +40,29 @@ func (d *Dependencies) AddNewJoke(c *fiber.Ctx) error { Error: "URL provided is not a valid image", }) } - + // Validate if link already exists sql, args, err := d.Query. + Select("link"). + From("jokesbapak2"). + Where(squirrel.Eq{"link": body.Link}). + ToSql() + if err != nil { + return err + } + + v, err := conn.Query(*d.Context, sql, args...) + if err != nil && err != pgx.ErrNoRows { + return err + } + defer v.Close() + + if err == nil { + return c.Status(fiber.StatusConflict).JSON(Error{ + Error: "Given link is already on the jokesbapak2 database", + }) + } + + sql, args, err = d.Query. Insert("jokesbapak2"). Columns("link", "creator"). Values(body.Link, c.Locals("userID")). @@ -48,7 +71,6 @@ func (d *Dependencies) AddNewJoke(c *fiber.Ctx) error { return err } - // TODO: Implement solution if the link provided already exists. _, err = tx.Exec(*d.Context, sql, args...) if err != nil { return err diff --git a/api/app/handler/submit/schema.go b/api/app/handler/submit/schema.go index 3dd0b51..1a8584b 100644 --- a/api/app/handler/submit/schema.go +++ b/api/app/handler/submit/schema.go @@ -17,9 +17,10 @@ type SubmissionQuery struct { } type ResponseSubmission struct { - ID string `json:"id,omitempty"` - Message string `json:"message,omitempty"` - Data Submission `json:"data,omitempty"` + ID string `json:"id,omitempty"` + Message string `json:"message,omitempty"` + Submission Submission `json:"submission,omitempty"` + AuthorPage string `json:"author_page,omitempty"` } type Error struct { diff --git a/api/app/handler/submit/submit_add.go b/api/app/handler/submit/submit_add.go index 983528b..66ea9f0 100644 --- a/api/app/handler/submit/submit_add.go +++ b/api/app/handler/submit/submit_add.go @@ -2,16 +2,25 @@ package submit import ( "jokes-bapak2-api/app/core" + "net/url" "strings" "time" + "github.com/Masterminds/squirrel" "github.com/georgysavva/scany/pgxscan" "github.com/gofiber/fiber/v2" + "github.com/jackc/pgx/v4" ) func (d *Dependencies) SubmitJoke(c *fiber.Ctx) error { + conn, err := d.DB.Acquire(*d.Context) + if err != nil { + return err + } + defer conn.Release() + var body Submission - err := c.BodyParser(&body) + err = c.BodyParser(&body) if err != nil { return err } @@ -19,26 +28,26 @@ func (d *Dependencies) SubmitJoke(c *fiber.Ctx) error { // Image and/or Link should not be empty if body.Image == "" && body.Link == "" { return c.Status(fiber.StatusBadRequest).JSON(Error{ - Error: "a link or an image should be supplied in a form of multipart/form-data", + Error: "A link or an image should be supplied in a form of multipart/form-data", }) } // Author should be supplied if body.Author == "" { return c.Status(fiber.StatusBadRequest).JSON(Error{ - Error: "an author key consisting on the format \"yourname \" must be supplied", + Error: "An author key consisting on the format \"yourname \" must be supplied", }) } else { // Validate format valid := core.ValidateAuthor(body.Author) if !valid { return c.Status(fiber.StatusBadRequest).JSON(Error{ - Error: "please stick to the format of \"yourname \" and within 200 characters", + Error: "Please stick to the format of \"yourname \" and within 200 characters", }) } } - var url string + var link string // Check link validity if link was provided if body.Link != "" { @@ -52,25 +61,46 @@ func (d *Dependencies) SubmitJoke(c *fiber.Ctx) error { }) } - url = body.Link + link = body.Link } // If image was provided if body.Image != "" { image := strings.NewReader(body.Image) - url, err = core.UploadImage(d.HTTP, image) + link, err = core.UploadImage(d.HTTP, image) if err != nil { return err } } + // Validate if link already exists + sql, args, err := d.Query. + Select("link"). + From("submission"). + Where(squirrel.Eq{"link": link}). + ToSql() + if err != nil { + return err + } + + v, err := conn.Query(*d.Context, sql, args...) + if err != nil && err != pgx.ErrNoRows { + return err + } + defer v.Close() + + if err == nil { + return c.Status(fiber.StatusConflict).JSON(Error{ + Error: "Given link is already on the submission queue.", + }) + } now := time.Now().UTC().Format(time.RFC3339) - sql, args, err := d.Query. + sql, args, err = d.Query. Insert("submission"). Columns("link", "created_at", "author"). - Values(url, now, body.Author). + Values(link, now, body.Author). Suffix("RETURNING id,created_at,link,author,status"). ToSql() if err != nil { @@ -78,7 +108,7 @@ func (d *Dependencies) SubmitJoke(c *fiber.Ctx) error { } var submission []Submission - result, err := d.DB.Query(*d.Context, sql, args...) + result, err := conn.Query(*d.Context, sql, args...) if err != nil { return err } @@ -92,7 +122,8 @@ func (d *Dependencies) SubmitJoke(c *fiber.Ctx) error { return c. Status(fiber.StatusCreated). JSON(ResponseSubmission{ - Message: "Joke submitted. Please wait for a few days for admin to approve your submission.", - Data: submission[0], + Message: "Joke submitted. Please wait for a few days for admin to approve your submission.", + Submission: submission[0], + AuthorPage: "/submit?author=" + url.QueryEscape(body.Author), }) } diff --git a/api/app/platform/database/create.go b/api/app/platform/database/create.go index 9037326..44b2cfa 100644 --- a/api/app/platform/database/create.go +++ b/api/app/platform/database/create.go @@ -16,15 +16,9 @@ func Setup(db *pgxpool.Pool, ctx *context.Context) error { } defer conn.Release() - tx, err := conn.Begin(*ctx) - if err != nil { - return err - } - defer tx.Rollback(*ctx) - // administrators table var tableAuthExists bool - err = db.QueryRow(*ctx, `SELECT EXISTS ( + err = conn.QueryRow(*ctx, `SELECT EXISTS ( SELECT FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'administrators' @@ -47,7 +41,7 @@ func Setup(db *pgxpool.Pool, ctx *context.Context) error { return err } - _, err = tx.Exec(*ctx, sql) + _, err = conn.Query(*ctx, sql) if err != nil { log.Fatalln("18 - failed on table creation: ", err) return err @@ -58,7 +52,7 @@ func Setup(db *pgxpool.Pool, ctx *context.Context) error { // Check if table exists var tableJokesExists bool - err = db.QueryRow(*ctx, `SELECT EXISTS ( + err = conn.QueryRow(*ctx, `SELECT EXISTS ( SELECT FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'jokesbapak2' @@ -80,7 +74,7 @@ func Setup(db *pgxpool.Pool, ctx *context.Context) error { return err } - _, err = tx.Exec(*ctx, sql) + _, err = conn.Query(*ctx, sql) if err != nil { log.Fatalln("12 - failed on table creation: ", err) return err @@ -91,7 +85,7 @@ func Setup(db *pgxpool.Pool, ctx *context.Context) error { //Check if table exists var tableSubmissionExists bool - err = db.QueryRow(*ctx, `SELECT EXISTS ( + err = conn.QueryRow(*ctx, `SELECT EXISTS ( SELECT FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'submission' @@ -114,16 +108,11 @@ func Setup(db *pgxpool.Pool, ctx *context.Context) error { log.Fatalln("14 - failed on table creation: ", err) } - _, err = tx.Query(*ctx, sql) + _, err = conn.Query(*ctx, sql) if err != nil { log.Fatalln("15 - failed on table creation: ", err) } } - err = tx.Commit(*ctx) - if err != nil { - return err - } - return nil } diff --git a/api/app/platform/database/placeholder.sql b/api/app/platform/database/placeholder.sql index 71023e5..07866bf 100644 --- a/api/app/platform/database/placeholder.sql +++ b/api/app/platform/database/placeholder.sql @@ -8,14 +8,14 @@ INSERT INTO "administrators" ("id", "key", "token", "last_used") VALUES -- 10 jokes is enough right? -INSERT INTO "jokesbapak2" ("id", "link", "creator") VALUES -(1, 'https://picsum.photos/id/1000/500/500', 1), -(2, 'https://picsum.photos/id/1001/500/500', 1), -(3, 'https://picsum.photos/id/1002/500/500', 1), -(4, 'https://picsum.photos/id/1003/500/500', 1), -(5, 'https://picsum.photos/id/1004/500/500', 1), -(6, 'https://picsum.photos/id/1005/500/500', 1), -(7, 'https://picsum.photos/id/1006/500/500', 1), -(8, 'https://picsum.photos/id/1010/500/500', 1), -(9, 'https://picsum.photos/id/1008/500/500', 1), -(10, 'https://picsum.photos/id/1009/500/500', 1); \ No newline at end of file +INSERT INTO "jokesbapak2" ("link", "creator") VALUES +('https://picsum.photos/id/1000/500/500', 1), +('https://picsum.photos/id/1001/500/500', 1), +('https://picsum.photos/id/1002/500/500', 1), +('https://picsum.photos/id/1003/500/500', 1), +('https://picsum.photos/id/1004/500/500', 1), +('https://picsum.photos/id/1005/500/500', 1), +('https://picsum.photos/id/1006/500/500', 1), +('https://picsum.photos/id/1010/500/500', 1), +('https://picsum.photos/id/1008/500/500', 1), +('https://picsum.photos/id/1009/500/500', 1); \ No newline at end of file diff --git a/api/app/routes/health.go b/api/app/routes/health.go index 28cbcca..0cce80f 100644 --- a/api/app/routes/health.go +++ b/api/app/routes/health.go @@ -14,6 +14,7 @@ func (d *Dependencies) Health() { Redis: d.Redis, Context: d.Context, } + d.App.Get("/health", cache.New(cache.Config{Expiration: 30 * time.Minute}), deps.Health) d.App.Get("/v1/health", cache.New(cache.Config{Expiration: 30 * time.Minute}), deps.Health) } diff --git a/api/app/routes/submit.go b/api/app/routes/submit.go index c677e45..bdd13af 100644 --- a/api/app/routes/submit.go +++ b/api/app/routes/submit.go @@ -10,12 +10,14 @@ import ( func (d *Dependencies) Submit() { deps := submit.Dependencies{ - DB: d.DB, - Redis: d.Redis, - Memory: d.Memory, - HTTP: d.HTTP, - Query: d.Query, + DB: d.DB, + Redis: d.Redis, + Memory: d.Memory, + HTTP: d.HTTP, + Query: d.Query, + Context: d.Context, } + // Get pending submitted joke d.App.Get( "/submit", diff --git a/api/main_test.go b/api/main_test.go index f1116ec..75df18b 100644 --- a/api/main_test.go +++ b/api/main_test.go @@ -16,51 +16,31 @@ import ( var jokesData = []interface{}{1, "https://via.placeholder.com/300/06f/fff.png", 1, 2, "https://via.placeholder.com/300/07f/fff.png", 1, 3, "https://via.placeholder.com/300/08f/fff.png", 1} var submissionData = []interface{}{1, "https://via.placeholder.com/300/01f/fff.png", "2021-08-03T18:20:38Z", "Test ", 0, 2, "https://via.placeholder.com/300/02f/fff.png", "2021-08-04T18:20:38Z", "Test ", 1} var administratorsData = []interface{}{1, "very secure", "not the real one", time.Now().Format(time.RFC3339), 2, "test", "$argon2id$v=19$m=65536,t=16,p=4$3a08c79fbf2222467a623df9a9ebf75802c65a4f9be36eb1df2f5d2052d53cb7$ce434bd38f7ba1fc1f2eb773afb8a1f7f2dad49140803ac6cb9d7256ce9826fb3b4afa1e2488da511c852fc6c33a76d5657eba6298a8e49d617b9972645b7106", ""} - -var db *pgxpool.Pool var ctx context.Context = context.Background() func TestMain(m *testing.M) { flag.Parse() + log.Println("---- Preparing for integration test") err := setup() if err != nil { log.Fatalln(err) } + log.Println("---- Preparation complete") + log.Print("\n") code := m.Run() os.Exit(code) } -func cleanup() { - poolConfig, err := pgxpool.ParseConfig(os.Getenv("DATABASE_URL")) - if err != nil { - log.Fatalln("Unable to create pool config", err) - } - poolConfig.MaxConns = 3 - poolConfig.MinConns = 1 - - db, err = pgxpool.ConnectConfig(ctx, poolConfig) - if err != nil { - log.Fatalln("Unable to create connection", err) - } - defer db.Close() - - d, err := db.Query(ctx, "BEGIN; DROP TABLE \"jokesbapak2\"; DROP TABLE \"administrators\"; DROP TABLE \"submission\"; COMMIT;") - if err != nil { - panic(err) - } - defer d.Close() -} - func setup() error { poolConfig, err := pgxpool.ParseConfig(os.Getenv("DATABASE_URL")) if err != nil { return errors.New("Unable to create pool config: " + err.Error()) } - poolConfig.MaxConns = 3 - poolConfig.MinConns = 1 + poolConfig.MaxConns = 15 + poolConfig.MinConns = 2 - db, err = pgxpool.ConnectConfig(ctx, poolConfig) + db, err := pgxpool.ConnectConfig(ctx, poolConfig) if err != nil { return errors.New("Unable to create connection: " + err.Error()) } @@ -72,59 +52,50 @@ func setup() error { } defer conn.Release() - tx, err := conn.Begin(ctx) - if err != nil { - return err - } - defer tx.Rollback(ctx) + // dj, err := conn.Query(ctx, "DROP TABLE \"jokesbapak2\"") + // if err != nil { + // log.Println("busy here - 57") + // return err + // } + // defer dj.Close() - _, err = tx.Exec(ctx, "DROP TABLE IF EXISTS \"jokesbapak2\"") - if err != nil { - return err - } - _, err = tx.Exec(ctx, "DROP TABLE IF EXISTS \"administrators\"") - if err != nil { - return err - } - _, err = tx.Exec(ctx, "DROP TABLE IF EXISTS \"submission\"") - if err != nil { - return err - } - err = tx.Commit(ctx) - if err != nil { - return err - } + // ds, err := conn.Query(ctx, "DROP TABLE \"submission\"") + // if err != nil { + // log.Println("busy here - 67") + // return err + // } + // defer ds.Close() + + // da, err := conn.Query(ctx, "DROP TABLE \"administrators\"") + // if err != nil { + // log.Println("busy here - 62") + // return err + // } + // defer da.Close() err = database.Setup(db, &ctx) if err != nil { + log.Println("busy here - 73") return err } - tx, err = conn.Begin(ctx) + ia, err := conn.Query(ctx, "INSERT INTO \"administrators\" (id, key, token, last_used) VALUES ($1, $2, $3, $4), ($5, $6, $7, $8);", administratorsData...) if err != nil { return err } - defer tx.Rollback(ctx) + defer ia.Close() - _, err = tx.Exec(ctx, "INSERT INTO \"administrators\" (id, key, token, last_used) VALUES ($1, $2, $3, $4), ($5, $6, $7, $8);", administratorsData...) + ij, err := conn.Query(ctx, "INSERT INTO \"jokesbapak2\" (id, link, creator) VALUES ($1, $2, $3), ($4, $5, $6), ($7, $8, $9);", jokesData...) if err != nil { return err } + defer ij.Close() - _, err = tx.Exec(ctx, "INSERT INTO \"jokesbapak2\" (id, link, creator) VALUES ($1, $2, $3), ($4, $5, $6), ($7, $8, $9);", jokesData...) - if err != nil { - return err - } - - _, err = tx.Exec(ctx, "INSERT INTO \"submission\" (id, link, created_at, author, status) VALUES ($1, $2, $3, $4, $5), ($6, $7, $8, $9, $10);", submissionData...) - if err != nil { - return err - } - - err = tx.Commit(ctx) + is, err := conn.Query(ctx, "INSERT INTO \"submission\" (id, link, created_at, author, status) VALUES ($1, $2, $3, $4, $5), ($6, $7, $8, $9, $10);", submissionData...) if err != nil { return err } + defer is.Close() return nil }