Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[wip] add: code submission endpoint #9

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+228 −43
Draft

[wip] add: code submission endpoint #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d14f73
add: code submission endpoint
matheusfrancisco Apr 7, 2024
bcd7cef
fix lint
matheusfrancisco Apr 7, 2024
6034998
add: adpater, and controller to submit code execution
matheusfrancisco Apr 8, 2024
5a07925
fix: integration test
matheusfrancisco Apr 9, 2024
b7cdb3e
unused binding
matheusfrancisco Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{:paths ["src" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.11.2"}
:deps {org.clojure/clojure {:mvn/version "1.11.2"}
com.github.parenthesin/components {:mvn/version "0.2.5"
:exclusions [prismatic/schema]}
com.github.seancorfield/honeysql {:mvn/version "2.6.1126"}
metosin/malli {:mvn/version "0.15.0"}
metosin/reitit-swagger {:mvn/version "0.6.0"}
org.postgresql/postgresql {:mvn/version "42.7.3"}}
org.clj-commons/digest {:mvn/version "1.4.100"}
com.github.seancorfield/honeysql {:mvn/version "2.6.1126"}
metosin/malli {:mvn/version "0.15.0"}
metosin/reitit-swagger {:mvn/version "0.6.0"}
org.postgresql/postgresql {:mvn/version "42.7.3"}}
:aliases
{:dev {:extra-paths ["test" "dev"]
:extra-deps {org.clojars.bigsy/pg-embedded-clj {:mvn/version "1.0.1"}
lambdaisland/kaocha {:mvn/version "1.88.1376"}
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
nubank/matcher-combinators {:mvn/version "3.9.1"}
nubank/state-flow {:mvn/version "5.15.0"}}}
lambdaisland/kaocha {:mvn/version "1.88.1376"}
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
nubank/matcher-combinators {:mvn/version "3.9.1"}
nubank/state-flow {:mvn/version "5.15.0"}}}
:test {:extra-paths ["test"]
:extra-deps {org.clojars.bigsy/pg-embedded-clj {:mvn/version "1.0.1"}
lambdaisland/kaocha {:mvn/version "1.88.1376"}
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
nubank/matcher-combinators {:mvn/version "3.9.1"}
nubank/state-flow {:mvn/version "5.15.0"}}
lambdaisland/kaocha {:mvn/version "1.88.1376"}
lambdaisland/kaocha-cloverage {:mvn/version "1.1.89"}
nubank/matcher-combinators {:mvn/version "3.9.1"}
nubank/state-flow {:mvn/version "5.15.0"}}
:main-opts ["-m" "kaocha.runner"]}

:clojure-lsp {:replace-deps {com.github.clojure-lsp/clojure-lsp-standalone {:mvn/version "2024.03.13-13.11.00"}}
Expand Down
12 changes: 12 additions & 0 deletions src/codes/clj/contest/submission_runner/adapters/submission.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(ns codes.clj.contest.submission-runner.adapters.submission
(:require [codes.clj.contest.submission-runner.wire.db.submission :as wire.db.submission]
[codes.clj.contest.submission-runner.wire.in.submission :as wire.in.submission]))

(defn wire->internal
{:malli/schema [:=> [:cat wire.in.submission/Submission] wire.db.submission/Submission]}
[wire]
{:submission/id (-> wire :id)
:submission/code (-> wire :code)
:submission/code_hash (-> wire :code-hash)
:submission/language (-> wire :language)
:submission/test_cases (-> wire :test-cases)})
5 changes: 5 additions & 0 deletions src/codes/clj/contest/submission_runner/controllers/submission.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(ns codes.clj.contest.submission-runner.controllers.submission)

(defn submit-code-execution!
[submission]
(random-uuid))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are generating this just to insert into the database, you can delegate the UUID generation to postgres.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still not 100% clear what we are going to save on postgres
id, code, code-hash, language and test-cases as string?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good question, I think I would store information to be possible to trace back the author, contest and the submission.

I would have an table to the contests (where the base challenge, and test inputs (and demo test inputs) would be stored, another for the authors, another for the submission where you would have the challenge id, author id, and the submission itself, to not store to much data in the database I would keep only the latest submission for each challenge and author, so if I submit and answer for a challenge we update the submission table by author-id and challenge-id with the new code, code-hash and updated date

After I would have a table with the execution results where you could store submission-id, code-hash and the result.

We can whiteboard this later if you want so.

Copy link
Member Author

@matheusfrancisco matheusfrancisco Apr 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can whiteboard this later if you want so.

I would love to whiteboard this

12 changes: 8 additions & 4 deletions src/codes/clj/contest/submission_runner/ports/http_in/submission.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
(ns codes.clj.contest.submission-runner.ports.http-in.submission)
(ns codes.clj.contest.submission-runner.ports.http-in.submission
(:require [codes.clj.contest.submission-runner.adapters.submission :as adapters.submission]
[codes.clj.contest.submission-runner.controllers.submission :as controllers.submission]))

(defn submit-code-execution!
[{_submission :parameters
[{{submission :body} :parameters
_components :components}]
{:status 201
:body {:id (random-uuid)}})
(let [id (-> submission
(adapters.submission/wire->internal)
(controllers.submission/submit-code-execution!))]
{:status 201}))

13 changes: 13 additions & 0 deletions src/codes/clj/contest/submission_runner/wire/db/submission.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
(ns codes.clj.contest.submission-runner.wire.db.submission)

(def Submission
[:map
[:submission/id string?]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UUID?

[:submission/code string?]
[:submission/code_hash string?]
[:submission/language [:enum :clojure]]
[:submission/test_cases
[:map-of :keyword
[:map
[:input :any]
[:output :any]]]]])
2 changes: 2 additions & 0 deletions src/codes/clj/contest/submission_runner/wire/in/submission.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

(def Submission
[:map
[:id string?]
[:code string?]
[:code-hash string?]
[:language [:enum :clojure]]
[:test-cases [:map-of :keyword
[:map
Expand Down
11 changes: 8 additions & 3 deletions test/integration/codes/clj/contest/submission_runner/submission_runner_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[integration.codes.clj.contest.submission-runner.util :as util]
[matcher-combinators.matchers :as matchers]
[parenthesin.helpers.malli :as helpers.malli]
[clj-commons.digest :as digest]
[parenthesin.helpers.state-flow.server.pedestal :as state-flow.server]
[state-flow.api :refer [defflow]]
[state-flow.assertions.matcher-combinators :refer [match?]]
Expand All @@ -17,9 +18,13 @@
:fail-fast? true}

(flow "should receive an submission"
[:let [submission-input {:code "(ns runner
(:require [clojure.test :refer [use-fixtures]])
(defn my-sum [a b] (+ a b)))"
[:let [id (random-uuid)
code "(ns runner
(:require [clojure.string :as str]))
(defn my-sum [a b] (+ a b))"
submission-input {:id id
:code code
:code-hash (digest/md5 code)
:language :clojure
:test-cases {:case-1 {:input "(my-sum 1 2)"
:output 3}
Expand Down
44 changes: 44 additions & 0 deletions test/unit/codes/clj/contest/submission_runner/adapters/submission_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
(ns unit.codes.clj.contest.submission-runner.adapters.submission-test
(:require [clj-commons.digest :as digest]
[clojure.test :refer [deftest is testing use-fixtures]]
[clojure.test.check.clojure-test :refer [defspec]]
[clojure.test.check.properties :as properties]
[codes.clj.contest.submission-runner.adapters.submission :as adapters.submission]
[codes.clj.contest.submission-runner.wire.db.submission :as wire.db.submission]
[codes.clj.contest.submission-runner.wire.in.submission :as wire.in.submission]
[malli.core :as m]
[malli.generator :as mg]
[matcher-combinators.test :refer [match?]]
[parenthesin.helpers.malli :as helpers.malli]))

(use-fixtures :once helpers.malli/with-intrumentation)

(defspec wirer->internal-spec 50
(properties/for-all [code (mg/generator wire.in.submission/Submission)]
(m/validate wire.db.submission/Submission (adapters.submission/wire->internal code))))

(def id (random-uuid))
(def code "(ns runner
(:require [clojure.string :as str]))
(defn my-sum [a b] (+ a b))")

(def code-submission {:id (str id)
:code code
:code-hash (digest/md5 code)
:language :clojure
:test-cases {:case-1 {:input "(my-sum 1 2)"
:output 3}
:case-2 {:input "(my-sum 2 3)"
:output 5}}})

(deftest wire->internal
(testing "adpater to db submission"
(is (match? {:submission/id (str id)
:submission/code code
:submission/code_hash (digest/md5 code)
:submission/language :clojure
:submission/test_cases {:case-1 {:input "(my-sum 1 2)"
:output 3}
:case-2 {:input "(my-sum 2 3)"
:output 5}}}
(adapters.submission/wire->internal code-submission)))))
Loading