diff --git a/back-end/project.clj b/back-end/project.clj index 44e885ac..e5567e09 100644 --- a/back-end/project.clj +++ b/back-end/project.clj @@ -21,7 +21,7 @@ [compojure "1.7.1"] [cheshire "5.13.0"] [cljstache "2.0.6"] - [integrant "0.8.0"] + [integrant "0.13.1"] [org.clojure/tools.namespace "0.3.1"] [com.walmartlabs/lacinia "0.38.0"] [e85th/venia "0.2.5-1"] diff --git a/back-end/src/vr_match_back_end/app/my_webapp/endpoint.clj b/back-end/src/vr_match_back_end/app/my_webapp/endpoint.clj index 21038795..87fcd7ea 100644 --- a/back-end/src/vr_match_back_end/app/my_webapp/endpoint.clj +++ b/back-end/src/vr_match_back_end/app/my_webapp/endpoint.clj @@ -55,8 +55,7 @@ (-> h :server .stop) nil)) -(defmethod ig/pre-init-spec ::endpoint [_] - (s/keys - :req-un [::port - ::client-origin - :handler/my-webapp-handler])) +(defmethod ig/assert-key ::endpoint [_ {:keys [port client-origin my-webapp-handler]}] + (assert port "port is required") + (assert client-origin "client-origin is required") + (assert my-webapp-handler "my-webapp-handler is required")) diff --git a/back-end/src/vr_match_back_end/app/my_webapp/handler.clj b/back-end/src/vr_match_back_end/app/my_webapp/handler.clj index 1817573b..ebfd842d 100644 --- a/back-end/src/vr_match_back_end/app/my_webapp/handler.clj +++ b/back-end/src/vr_match_back_end/app/my_webapp/handler.clj @@ -69,5 +69,5 @@ (defmethod ig/halt-key! ::my-webapp-handler [_ _] nil) -(defmethod ig/pre-init-spec ::my-webapp-handler [_] - (s/keys :req-un [:resolvers/my-webapp-resolvers])) +(defmethod ig/assert-key ::my-webapp-handler [_ {:keys [my-webapp-resolvers]}] + (assert my-webapp-resolvers "my-webapp-resolvers is required")) diff --git a/back-end/src/vr_match_back_end/app/my_webapp/resolvers.clj b/back-end/src/vr_match_back_end/app/my_webapp/resolvers.clj index 28dbb1ab..a8ee137b 100644 --- a/back-end/src/vr_match_back_end/app/my_webapp/resolvers.clj +++ b/back-end/src/vr_match_back_end/app/my_webapp/resolvers.clj @@ -309,9 +309,9 @@ (defmethod ig/halt-key! ::my-webapp-resolvers [_ _] nil) -(defmethod ig/pre-init-spec ::my-webapp-resolvers [_] - (s/keys :req-un [:uauth/auth-usecase - :uplatform/platform-usecase - :uimage/image-usecase - :uuser/user-usecase - :uapproach/approach-usecase])) +(defmethod ig/assert-key ::my-webapp-resolvers [_ {:keys [auth-usecase platform-usecase image-usecase user-usecase approach-usecase]}] + (assert auth-usecase "auth-usecase is required") + (assert platform-usecase "platform-usecase is required") + (assert image-usecase "image-usecase is required") + (assert user-usecase "user-usecase is required") + (assert approach-usecase "approach-usecase is required")) diff --git a/back-end/src/vr_match_back_end/domain/usecase/approach.clj b/back-end/src/vr_match_back_end/domain/usecase/approach.clj index b8672d40..da5433f2 100644 --- a/back-end/src/vr_match_back_end/domain/usecase/approach.clj +++ b/back-end/src/vr_match_back_end/domain/usecase/approach.clj @@ -60,5 +60,5 @@ (defmethod ig/halt-key! ::approach-usecase [_ _] nil) -(defmethod ig/pre-init-spec ::approach-usecase [_] - (s/keys :req-un [:ruser/user-repository])) +(defmethod ig/assert-key ::approach-usecase [_ {:keys [user-repository]}] + (assert user-repository "user-repository is required")) diff --git a/back-end/src/vr_match_back_end/domain/usecase/auth.clj b/back-end/src/vr_match_back_end/domain/usecase/auth.clj index a788b6d8..c9da08eb 100644 --- a/back-end/src/vr_match_back_end/domain/usecase/auth.clj +++ b/back-end/src/vr_match_back_end/domain/usecase/auth.clj @@ -25,5 +25,5 @@ (defmethod ig/halt-key! ::auth-usecase [_ _] nil) -(defmethod ig/pre-init-spec ::auth-usecase [_] - (s/keys :req-un [:ruser/user-repository])) +(defmethod ig/assert-key ::auth-usecase [_ {:keys [user-repository]}] + (assert user-repository "user-repository is required")) diff --git a/back-end/src/vr_match_back_end/domain/usecase/image.clj b/back-end/src/vr_match_back_end/domain/usecase/image.clj index 5d5e76eb..c4629cf0 100644 --- a/back-end/src/vr_match_back_end/domain/usecase/image.clj +++ b/back-end/src/vr_match_back_end/domain/usecase/image.clj @@ -30,6 +30,7 @@ (defmethod ig/halt-key! ::image-usecase [_ _] nil) -(defmethod ig/pre-init-spec ::image-usecase [_] - (s/keys :req-un [:ruser/user-repository :rimage/image-repository])) +(defmethod ig/assert-key ::image-usecase [_ {:keys [user-repository image-repository]}] + (assert user-repository "user-repository is required") + (assert image-repository "image-repository is required")) diff --git a/back-end/src/vr_match_back_end/domain/usecase/platform.clj b/back-end/src/vr_match_back_end/domain/usecase/platform.clj index 196d94f3..a834df04 100644 --- a/back-end/src/vr_match_back_end/domain/usecase/platform.clj +++ b/back-end/src/vr_match_back_end/domain/usecase/platform.clj @@ -20,6 +20,6 @@ (defmethod ig/halt-key! ::platform-usecase [_ _] nil) -(defmethod ig/pre-init-spec ::platform-usecase [_] - (s/keys :req-un [:rplatform/platform-repository])) +(defmethod ig/assert-key ::platform-usecase [_ {:keys [platform-repository]}] + (assert platform-repository "platform-repository is required")) diff --git a/back-end/src/vr_match_back_end/domain/usecase/user.clj b/back-end/src/vr_match_back_end/domain/usecase/user.clj index edf5cdb5..a657fe62 100644 --- a/back-end/src/vr_match_back_end/domain/usecase/user.clj +++ b/back-end/src/vr_match_back_end/domain/usecase/user.clj @@ -197,5 +197,5 @@ (defmethod ig/halt-key! ::user-usecase [_ _] nil) -(defmethod ig/pre-init-spec ::user-usecase [_] - (s/keys :req-un [:ruser/user-repository])) +(defmethod ig/assert-key ::user-usecase [_ {:keys [user-repository]}] + (assert user-repository "user-repository is required")) diff --git a/back-end/src/vr_match_back_end/infra/datasource/cloud_storage.clj b/back-end/src/vr_match_back_end/infra/datasource/cloud_storage.clj index d68ea7a4..88b5af20 100644 --- a/back-end/src/vr_match_back_end/infra/datasource/cloud_storage.clj +++ b/back-end/src/vr_match_back_end/infra/datasource/cloud_storage.clj @@ -32,5 +32,5 @@ (defmethod ig/prep-key ::cloud-storage-datasource [_ config] (merge config {:bucket-name ""})) -(defmethod ig/pre-init-spec ::cloud-storage-datasource [_] - (s/keys :req-un [::bucket-name])) +(defmethod ig/assert-key ::cloud-storage-datasource [_ {:keys [bucket-name]}] + (assert bucket-name "bucket-name is required")) diff --git a/back-end/src/vr_match_back_end/infra/datasource/firebase_admin.clj b/back-end/src/vr_match_back_end/infra/datasource/firebase_admin.clj index 26560bea..a5b16482 100644 --- a/back-end/src/vr_match_back_end/infra/datasource/firebase_admin.clj +++ b/back-end/src/vr_match_back_end/infra/datasource/firebase_admin.clj @@ -44,5 +44,6 @@ (merge config {:database-url "https://vr-match.firebaseio.com" :credential ""})) -(defmethod ig/pre-init-spec ::firebase-admin-datasource [_] - (s/keys :req-un [::database-url ::credential])) +(defmethod ig/assert-key ::firebase-admin-datasource [_ {:keys [database-url credential]}] + (assert database-url "database-url is required") + (assert credential "credential is required")) diff --git a/back-end/src/vr_match_back_end/infra/datasource/mysql.clj b/back-end/src/vr_match_back_end/infra/datasource/mysql.clj index 8ea623af..74f9df36 100644 --- a/back-end/src/vr_match_back_end/infra/datasource/mysql.clj +++ b/back-end/src/vr_match_back_end/infra/datasource/mysql.clj @@ -44,5 +44,9 @@ :password ""} config)) -(defmethod ig/pre-init-spec ::mysql-datasource [_] - (s/keys :req-un [::dbname ::user ::password ::hostname ::port])) +(defmethod ig/assert-key ::mysql-datasource [_ {:keys [dbname user password hostname port]}] + (assert dbname "dbname is required") + (assert user "user is required") + (assert password "password is required") + (assert hostname "hostname is required") + (assert port "port is required")) diff --git a/back-end/src/vr_match_back_end/infra/repository/image.clj b/back-end/src/vr_match_back_end/infra/repository/image.clj index fe94b048..c50c01d1 100644 --- a/back-end/src/vr_match_back_end/infra/repository/image.clj +++ b/back-end/src/vr_match_back_end/infra/repository/image.clj @@ -70,5 +70,6 @@ (defmethod ig/halt-key! ::image-repository [_ _] nil) -(defmethod ig/pre-init-spec ::image-repository [_] - (s/keys :req-un [:mysql/mysql-datasource :cloud-storage/cloud-storage-datasource])) +(defmethod ig/assert-key ::image-repository [_ {:keys [mysql-datasource cloud-storage-datasource]}] + (assert mysql-datasource "mysql-datasource is required") + (assert cloud-storage-datasource "cloud-storage-datasource is required")) diff --git a/back-end/src/vr_match_back_end/infra/repository/platform.clj b/back-end/src/vr_match_back_end/infra/repository/platform.clj index 87e073b0..db2d01cb 100644 --- a/back-end/src/vr_match_back_end/infra/repository/platform.clj +++ b/back-end/src/vr_match_back_end/infra/repository/platform.clj @@ -45,5 +45,5 @@ (defmethod ig/halt-key! ::platform-repository [_ _] nil) -(defmethod ig/pre-init-spec ::platform-repository [_] - (s/keys :req-un [:mysql/mysql-datasource])) +(defmethod ig/assert-key ::platform-repository [_ {:keys [mysql-datasource]}] + (assert mysql-datasource "mysql-datasource is required")) diff --git a/back-end/src/vr_match_back_end/infra/repository/user.clj b/back-end/src/vr_match_back_end/infra/repository/user.clj index 104adcc6..497d0256 100644 --- a/back-end/src/vr_match_back_end/infra/repository/user.clj +++ b/back-end/src/vr_match_back_end/infra/repository/user.clj @@ -543,5 +543,6 @@ (defmethod ig/halt-key! ::user-repository [_ _] nil) -(defmethod ig/pre-init-spec ::user-repository [_] - (s/keys :req-un [:mysql/mysql-datasource :firebase-admin/firebase-admin-datasource])) +(defmethod ig/assert-key ::user-repository [_ {:keys [mysql-datasource firebase-admin-datasource]}] + (assert mysql-datasource "mysql-datasource is required") + (assert firebase-admin-datasource "firebase-admin-datasource is required"))