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

feat: Add Experiment Filters for Invitations #258

Merged
merged 11 commits into from
Nov 24, 2023
Merged

feat: Add Experiment Filters for Invitations #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c49c03
feat: sketch additional invitation and assignment filters
leostera Nov 17, 2023
212a367
test: add first test for experiment filter
leostera Nov 17, 2023
cc9a6fe
chore: format
leostera Nov 21, 2023
4e44766
preliminary create all search tables before querying
leostera Nov 21, 2023
cb90b56
clean test, make error message more helpful
leostera Nov 23, 2023
63e091a
get invitation filter working
leostera Nov 23, 2023
30b4af3
address PR comments
leostera Nov 23, 2023
5057fcf
add exclusion tests
leostera Nov 23, 2023
70936bf
format
leostera Nov 23, 2023
6b4c1ba
Address pr comments
leostera Nov 23, 2023
6500b5c
move to CCList
leostera Nov 24, 2023
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
8 changes: 5 additions & 3 deletions esy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
"@opam/containers": "3.12",
"@opam/containers-data": "3.12",
"@opam/cstruct": "*",
"@opam/dune": "*",
"@opam/guardian": "*",
"@opam/logs": "0.7.0",
"@opam/lwt": "5.7.0",
"@opam/lwt_ppx": "2.1.0",
"@opam/lwt_ssl": "1.2.0",
"@opam/mariadb": "*",
"@opam/ocaml-lsp-server": "*",
"@opam/ocamlformat": "0.26.1",
"@opam/mirage-crypto": "*",
"@opam/mirage-crypto-rng": "*",
"@opam/mirage-crypto-rng-lwt": "*",
Expand All @@ -40,6 +37,11 @@
"esy-openssl": "*",
"ocaml": "4.14.0"
},
"devDependencies": {
"@opam/dune": "*",
"@opam/ocamlformat": "*",
"@opam/ocaml-lsp-server": "*"
},
"resolutions": {
"@opam/canary": "uzh/canary#02cf40e029268560e160ca032850426e387aa598",
"@opam/comformist": "oxidizing/conformist#aa7b95d1f39215cdaab8cf96d765d63e41d5f8a6",
Expand Down
75 changes: 38 additions & 37 deletions esy.lock/index.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions esy.lock/opam/ocaml-lsp-server.1.16.2/opam → esy.lock/opam/ocaml-lsp-server.1.16.1/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions esy.lock/opam/tls-lwt.0.17.1/opam → esy.lock/opam/tls-lwt.0.17.3/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions esy.lock/opam/tls.0.17.1/opam → esy.lock/opam/tls.0.17.3/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pool.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ depends: [
"containers-data" {>= "3.6"}
"mariadb" {>= "1.1.6" & < "2.0.0"}
"caqti-driver-mariadb" {>= "2.0.1"}
"caqti-lwt" {>= "2.0.1" }
"caqti-lwt" {>= "2.0.1"}
"caqti" {>= "2.0.1"}
"ocamlformat" {>= "0.18.0"}
"ppx_deriving" {>= "5.2.1"}
Expand Down
8 changes: 4 additions & 4 deletions pool/app/filter/entity.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ module Key = struct
[@name "num_participations"]
| NumShowUps [@printer print "num_show_ups"] [@name "num_show_ups"]
| Participation [@printer print "participation"] [@name "participation"]
| Invitation [@printer print "invitation"] [@name "invitation"]
| Tag [@printer print "tag"] [@name "tag"]
[@@deriving show { with_path = false }, eq, yojson, variants, enum]

Expand Down Expand Up @@ -205,7 +206,7 @@ module Key = struct
| NumNoShows -> Ok "pool_contacts.num_no_shows"
| NumParticipations -> Ok "pool_contacts.num_participations"
| NumShowUps -> Ok "pool_contacts.num_show_ups"
| Participation | Tag ->
| Invitation | Participation | Tag ->
Error Pool_common.Message.(QueryNotCompatible (Field.Key, Field.Value))
;;

Expand All @@ -219,7 +220,7 @@ module Key = struct
| NumNoShows
| NumParticipations
| NumShowUps -> Nr
| Participation -> QueryExperiments
| Invitation | Participation -> QueryExperiments
| Tag -> QueryTags
;;

Expand Down Expand Up @@ -531,8 +532,7 @@ module Operator = struct
| NumNoShows
| NumParticipations
| NumShowUps -> all_equality_operators @ all_size_operators
| Participation -> all_list_operators
| Tag -> all_list_operators
| Participation | Tag | Invitation -> all_list_operators
;;

let input_type_to_operator (key : Key.input_type) =
Expand Down
1 change: 1 addition & 0 deletions pool/app/filter/filter.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module Key : sig
| NumParticipations
| NumShowUps
| Participation
| Invitation
| Tag

type t =
Expand Down
Loading