diff --git a/docs/_docs/dev-guide/introduction.md b/docs/_docs/dev-guide/introduction.md index c5e592483..6bf56a4f6 100644 --- a/docs/_docs/dev-guide/introduction.md +++ b/docs/_docs/dev-guide/introduction.md @@ -1,6 +1,6 @@ --- title: Introduction -tags: +tags: - Dev Guide description: Read this before contributing to Realm! permalink: dev-guide/introduction @@ -15,7 +15,7 @@ Realm is under heavy active development and documentation can go stale quickly i We will do our best during code review to catch changes that require documentation updates, but sometimes things will slip by. If you notice a discrepancy between our codebase and the documentation, please kindly [file an issue](https://github.com/kcarretto/realm/issues/new?labels=documentation&title=Documentation%20Discrepancy:&body=Please%20include%20the%20location%20of%20the%20inaccurate%20documentation%20and%20a%20helpful%20description%20of%20what%20needs%20improvement.) to track it or submit a PR to correct it. You can use the ["Edit this page"](https://github.com/kcarretto/realm/edit/main/docs/_docs/dev-guide/introduction.md) feature in the right navbar of the documentation to quickly navigate to the appropriate section of documentation that requires an update. -### Testing +### Testing Realm contains code across a variety of languages and frameworks. Testing helps ensure our codebase remains stable, enables us to refactor and develop new features with confidence, and can help new Realm developers understand the expected behavior of our code. Below is an outline of the testing requirements for each portion of the codebase, as well as guidance on testing best practices. @@ -60,7 +60,7 @@ A Task represents a set of instructions to perform on a Target system. For examp References malicious code or persistence mechanisms that are deployed to compromise target systems. Some configuration information for Implants (e.g. `ImplantConfigs`) can be managed through Tavern. ### Agent -An Agent is a type of implant which retrieves execution instructions by connecting to our backend infrastructure (calling back) and querying for new tasks. +An Agent is a type of implant which retrieves execution instructions by connecting to our backend infrastructure (calling back) and querying for new tasks. # Project Structure * **[.devcontainer](https://github.com/KCarretto/realm/tree/main/.devcontainer)** contains settings required for configuring a VSCode dev container that can be used for Realm development @@ -75,9 +75,9 @@ An Agent is a type of implant which retrieves execution instructions by connecti * **[implants/lib/tavern](https://github.com/KCarretto/realm/tree/main/implants/lib/tavern)** is the source of our agents graphql API to interface with Tavern (Rust) * **[tavern](https://github.com/KCarretto/realm/tree/main/tavern)** is the parent folder of Tavern related code and packages, and stores the `main.go` executable for the service * **[tavern/auth](https://github.com/KCarretto/realm/tree/main/tavern/auth)** is a package for managing authentication for Tavern, and is used by various packages that rely on obtaining viewer information - * **[tavern/ent](https://github.com/KCarretto/realm/tree/main/tavern/ent)** contains models and related code for interacting with the database (most of this is code generated by **[entgo](https://entgo.io/))** - * **[tavern/ent/schema](https://github.com/KCarretto/realm/tree/main/tavern/ent/schema)** contains the schema definitions for our DB models - * **[tavern/graphql](https://github.com/KCarretto/realm/tree/main/tavern/graphql)** contains our GraphQL definitions and resolvers (most of this code is generated by **[entgo](https://entgo.io/)** and **[gqlgen](https://github.com/99designs/gqlgen))** + * **[tavern/internal/ent](https://github.com/KCarretto/realm/tree/main/tavern/internal/ent)** contains models and related code for interacting with the database (most of this is code generated by **[entgo](https://entgo.io/))** + * **[tavern/internal/ent/schema](https://github.com/KCarretto/realm/tree/main/tavern/internal/ent/schema)** contains the schema definitions for our DB models + * **[tavern/internal/graphql](https://github.com/KCarretto/realm/tree/main/tavern/internal/graphql)** contains our GraphQL definitions and resolvers (most of this code is generated by **[entgo](https://entgo.io/)** and **[gqlgen](https://github.com/99designs/gqlgen))** * **[tavern/internal](https://github.com/KCarretto/realm/tree/main/tavern/internal)** contains various internal packages that makeup Tavern * **[tavern/internal/www](https://github.com/KCarretto/realm/tree/main/tavern/internal/www)** contains Tavern's UI code * **[terraform](https://github.com/KCarretto/realm/tree/main/terraform)** contains the Terraform used to deploy a production ready Realm instance. See [Tavern User Guide](https://docs.realm.pub/user-guide/tavern) to learn how to use. diff --git a/docs/_docs/dev-guide/tavern.md b/docs/_docs/dev-guide/tavern.md index 2733eac1b..1b090d64b 100644 --- a/docs/_docs/dev-guide/tavern.md +++ b/docs/_docs/dev-guide/tavern.md @@ -214,10 +214,10 @@ query get_task_res { ### Creating a New Model 1. Initialize the schema `cd tavern && go run entgo.io/ent/cmd/ent init ` -2. Update the generated file in `tavern/ent/schema/.go` +2. Update the generated file in `tavern/internal/ent/schema/.go` 3. Ensure you include a `func () Annotations() []schema.Annotation` method which returns a `entgql.QueryField()` annotation to tell entgo to generate a GraphQL root query for this model (if you'd like it to be queryable from the root query) -4. Update `tavern/graphql/gqlgen.yml` to include the ent types in the `autobind:` section (e.g.`- github.com/kcarretto/realm/tavern/ent/`) -5. **Optionally** update the `models:` section of `tavern/graphql/gqlgen.yml` to bind any GraphQL enum types to their respective `entgo` generated types (e.g. `github.com/kcarretto/realm/tavern/ent/.`) +4. Update `tavern/internal/graphql/gqlgen.yml` to include the ent types in the `autobind:` section (e.g.`- github.com/kcarretto/realm/tavern/internal/ent/`) +5. **Optionally** update the `models:` section of `tavern/internal/graphql/gqlgen.yml` to bind any GraphQL enum types to their respective `entgo` generated types (e.g. `github.com/kcarretto/realm/tavern/internal/ent/.`) 6. Run `go generate ./tavern/...` from the project root 7. If you added an annotation for a root query field (see above), you will notice auto-generated the `query.resolvers.go` file has been updated with new methods to query your model (e.g. `func (r *queryResolver) s ...`) * This must be implemented (e.g. `return r.client..Query().All(ctx)` where NAME is the name of your model) @@ -225,22 +225,22 @@ query get_task_res { ### Adding Mutations 1. Update the `mutation.graphql` schema file to include your new mutation and please include it in the section for the model it's mutating if applicable (e.g. createUser should be defined near all the related User mutations) - * **Note:** Input types such as `CreateInput` or `UpdateInput` will already be generated if you [added the appropriate annotations to your ent schema](https://entgo.io/docs/tutorial-todo-gql#install-and-configure-entgql). If you require custom input mutations (e.g. `ClaimTasksInput`) then add them to the `inputs.graphql` file (Golang code will be generated in tavern/graphql/models e.g. `models.ClaimTasksInput`). + * **Note:** Input types such as `CreateInput` or `UpdateInput` will already be generated if you [added the appropriate annotations to your ent schema](https://entgo.io/docs/tutorial-todo-gql#install-and-configure-entgql). If you require custom input mutations (e.g. `ClaimTasksInput`) then add them to the `inputs.graphql` file (Golang code will be generated in tavern/internal/graphql/models e.g. `models.ClaimTasksInput`). 2. Run `go generate ./...` -3. Implement generated the generated mutation resolver method in `tavern/graphql/mutation.resolvers.go` +3. Implement generated the generated mutation resolver method in `tavern/internal/graphql/mutation.resolvers.go` * Depending on the mutation you're trying to implement, a one liner such as `return r.client..Create().SetInput(input).Save(ctx)` might be sufficient -4. Please write a unit test for your new mutation by defining YAML test cases in a new `testdata/mutations` subdirectory with your mutations name (e.g. `tavern/graphql/testdata/mutations/mymutation/SomeTest.yml`) +4. Please write a unit test for your new mutation by defining YAML test cases in a new `testdata/mutations` subdirectory with your mutations name (e.g. `tavern/internal/graphql/testdata/mutations/mymutation/SomeTest.yml`) ### Code Generation Reference * After making a change, remember to run `go generate ./...` from the project root. -* `tavern/ent/schema` is a directory which defines our graph using database models (ents) and the relations between them +* `tavern/internal/ent/schema` is a directory which defines our graph using database models (ents) and the relations between them * `tavern/generate.go` is responsible for generating ents defined by the ent schema as well as updating the GraphQL schema and generating related code -* `tavern/ent/entc.go` is responsible for generating code for the entgo <-> 99designs/gqlgen GraphQL integration -* `tavern/graphql/schema/mutation.graphql` defines all mutations supported by our API -* `tavern/graphql/schema/query.graphql` is a GraphQL schema automatically generated by ent, providing useful types derived from our ent schemas as well as root-level queries defined by entgo annotations -* `tavern/graphql/schema/scalars.graphql` defines scalar GraphQL types that can be used to help with Go bindings (See [gqlgen docs](https://gqlgen.com/reference/scalars/) for more info) -* `tavern/graphql/schema/inputs.graphql` defines custom GraphQL inputs that can be used with your mutations (e.g. outside of the default auto-generated CRUD inputs) +* `tavern/internal/ent/entc.go` is responsible for generating code for the entgo <-> 99designs/gqlgen GraphQL integration +* `tavern/internal/graphql/schema/mutation.graphql` defines all mutations supported by our API +* `tavern/internal/graphql/schema/query.graphql` is a GraphQL schema automatically generated by ent, providing useful types derived from our ent schemas as well as root-level queries defined by entgo annotations +* `tavern/internal/graphql/schema/scalars.graphql` defines scalar GraphQL types that can be used to help with Go bindings (See [gqlgen docs](https://gqlgen.com/reference/scalars/) for more info) +* `tavern/internal/graphql/schema/inputs.graphql` defines custom GraphQL inputs that can be used with your mutations (e.g. outside of the default auto-generated CRUD inputs) ### YAML Test Reference @@ -274,7 +274,7 @@ This however restricts the available transport methods the agent may use to comm ### GraphQL Example -GraphQL mutations enable clients to _mutate_ or modify backend data. Tavern supports a variety of different mutations for interacting with the graph ([see schema](https://github.com/KCarretto/realm/blob/main/tavern/graphql/schema/mutation.graphql)). The two mutations agents rely on are `claimTasks` and `submitTaskResult` (covered in more detail below). GraphQL requests are submitted as HTTP POST requests to Tavern, with a JSON body including the GraphQL mutation. Below is an example JSON body that may be sent to the Tavern GraphQL API: +GraphQL mutations enable clients to _mutate_ or modify backend data. Tavern supports a variety of different mutations for interacting with the graph ([see schema](https://github.com/KCarretto/realm/blob/main/tavern/internal/graphql/schema/mutation.graphql)). The two mutations agents rely on are `claimTasks` and `submitTaskResult` (covered in more detail below). GraphQL requests are submitted as HTTP POST requests to Tavern, with a JSON body including the GraphQL mutation. Below is an example JSON body that may be sent to the Tavern GraphQL API: ```json { diff --git a/go.sum b/go.sum index d84f9705e..5295fa87f 100644 --- a/go.sum +++ b/go.sum @@ -88,14 +88,12 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU= github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU= github.com/vektah/gqlparser/v2 v2.5.1 h1:ZGu+bquAY23jsxDRcYpWjttRZrUz07LbiY77gUOHcr4= github.com/vektah/gqlparser/v2 v2.5.1/go.mod h1:mPgqFBu/woKTVYWyNk8cO3kh4S/f4aRFZrvOnp3hmCs= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0= github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/implants/lib/tavern/graphql/schema.graphql b/implants/lib/tavern/graphql/schema.graphql index aed90d9d6..c3cec5ff6 100644 --- a/implants/lib/tavern/graphql/schema.graphql +++ b/implants/lib/tavern/graphql/schema.graphql @@ -29,7 +29,7 @@ type Beacon implements Node { tasks: [Task!] } """BeaconHostPlatform is enum for the field host_platform""" -enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/ent/beacon.HostPlatform") { +enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/beacon.HostPlatform") { Windows Linux MacOS @@ -337,6 +337,47 @@ input FileWhereInput { hashEqualFold: String hashContainsFold: String } +""" +An object with an ID. +Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) +""" +interface Node @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent.Noder") { + """The id of the object.""" + id: ID! +} +"""Possible directions in which to order a list of items when provided an `orderBy` argument.""" +enum OrderDirection { + """Specifies an ascending order for a given `orderBy` argument.""" + ASC + """Specifies a descending order for a given `orderBy` argument.""" + DESC +} +""" +Information about pagination in a connection. +https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo +""" +type PageInfo { + """When paginating forwards, are there more items?""" + hasNextPage: Boolean! + """When paginating backwards, are there more items?""" + hasPreviousPage: Boolean! + """When paginating backwards, the cursor to continue.""" + startCursor: Cursor + """When paginating forwards, the cursor to continue.""" + endCursor: Cursor +} +type Query { + """Fetches an object given its ID.""" + node( + """ID of the object.""" + id: ID! + ): Node + """Lookup nodes by a list of IDs.""" + nodes( + """The list of node IDs.""" + ids: [ID!]! + ): [Node]! +} type Quest implements Node { id: ID! """Timestamp of when this ent was created""" @@ -443,47 +484,6 @@ input QuestWhereInput { hasCreator: Boolean hasCreatorWith: [UserWhereInput!] } -""" -An object with an ID. -Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) -""" -interface Node @goModel(model: "github.com/kcarretto/realm/tavern/ent.Noder") { - """The id of the object.""" - id: ID! -} -"""Possible directions in which to order a list of items when provided an `orderBy` argument.""" -enum OrderDirection { - """Specifies an ascending order for a given `orderBy` argument.""" - ASC - """Specifies a descending order for a given `orderBy` argument.""" - DESC -} -""" -Information about pagination in a connection. -https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo -""" -type PageInfo { - """When paginating forwards, are there more items?""" - hasNextPage: Boolean! - """When paginating backwards, are there more items?""" - hasPreviousPage: Boolean! - """When paginating backwards, the cursor to continue.""" - startCursor: Cursor - """When paginating forwards, the cursor to continue.""" - endCursor: Cursor -} -type Query { - """Fetches an object given its ID.""" - node( - """ID of the object.""" - id: ID! - ): Node - """Lookup nodes by a list of IDs.""" - nodes( - """The list of node IDs.""" - ids: [ID!]! - ): [Node]! -} type Tag implements Node { id: ID! """Name of the tag""" @@ -493,7 +493,7 @@ type Tag implements Node { beacons: [Beacon!] } """TagKind is enum for the field kind""" -enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/ent/tag.Kind") { +enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/tag.Kind") { group service } diff --git a/tavern/app.go b/tavern/app.go index a3be659c9..6f56eb2ba 100644 --- a/tavern/app.go +++ b/tavern/app.go @@ -11,16 +11,16 @@ import ( "os" "entgo.io/contrib/entgql" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/kcarretto/realm/tavern/tomes" gqlgraphql "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/handler" "github.com/99designs/gqlgen/graphql/playground" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/migrate" + "github.com/kcarretto/realm/tavern/internal/auth" "github.com/kcarretto/realm/tavern/internal/cdn" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/migrate" "github.com/kcarretto/realm/tavern/internal/www" "github.com/urfave/cli" ) diff --git a/tavern/config.go b/tavern/config.go index 24f1b9808..0a8ee1862 100644 --- a/tavern/config.go +++ b/tavern/config.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" "golang.org/x/oauth2" "golang.org/x/oauth2/google" diff --git a/tavern/config_test.go b/tavern/config_test.go index e6caba060..d7c8b64e7 100644 --- a/tavern/config_test.go +++ b/tavern/config_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/kcarretto/realm/tavern/ent/migrate" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/migrate" + "github.com/kcarretto/realm/tavern/internal/ent/tag" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/oauth2" diff --git a/tavern/e2e_test.go b/tavern/e2e_test.go index 7ad8dd6ac..d544aa3cb 100644 --- a/tavern/e2e_test.go +++ b/tavern/e2e_test.go @@ -11,10 +11,10 @@ import ( "testing" tavern "github.com/kcarretto/realm/tavern" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent/quest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/ent/entc.go b/tavern/ent/entc.go deleted file mode 100644 index 90c585afe..000000000 --- a/tavern/ent/entc.go +++ /dev/null @@ -1,35 +0,0 @@ -//go:build ignore - -package main - -import ( - "log" - - "entgo.io/contrib/entgql" - "entgo.io/ent/entc" - "entgo.io/ent/entc/gen" -) - -func main() { - extensions, err := entgql.NewExtension( - entgql.WithSchemaGenerator(), - entgql.WithWhereInputs(true), - entgql.WithSchemaPath("./graphql/schema/ent.graphql"), - entgql.WithConfigPath("./graphql/gqlgen.yml"), - ) - if err != nil { - log.Fatalf("creating entgql extension: %v", err) - } - opts := []entc.Option{ - entc.Extensions(extensions), - entc.FeatureNames("privacy"), - } - - if err := entc.Generate( - "./ent/schema", - &gen.Config{}, - opts..., - ); err != nil { - log.Fatalf("running ent codegen: %v", err) - } -} diff --git a/tavern/generate.go b/tavern/generate.go deleted file mode 100644 index 42552e93e..000000000 --- a/tavern/generate.go +++ /dev/null @@ -1,8 +0,0 @@ -package main - -//go:generate go run -mod=mod ./ent/entc.go -//go:generate /bin/sh -c "cd ./graphql && go run -mod=mod github.com/99designs/gqlgen" - -//go:generate /bin/sh -c "cat ./graphql/schema/* > ./graphql/schema.graphql" -//go:generate /bin/sh -c "cp ./graphql/schema.graphql ../implants/lib/tavern/graphql/schema.graphql" -//go:generate /bin/sh -c "cd ../implants/lib/tavern && ./codegen.sh" diff --git a/tavern/auth/context.go b/tavern/internal/auth/context.go similarity index 97% rename from tavern/auth/context.go rename to tavern/internal/auth/context.go index 39eb4f2aa..c263c8bb3 100644 --- a/tavern/auth/context.go +++ b/tavern/internal/auth/context.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) var ( diff --git a/tavern/auth/middleware.go b/tavern/internal/auth/middleware.go similarity index 98% rename from tavern/auth/middleware.go rename to tavern/internal/auth/middleware.go index 415c18bbe..58912313e 100644 --- a/tavern/auth/middleware.go +++ b/tavern/internal/auth/middleware.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" ) // AuthDisabledMiddleware should only be used when authentication has been disabled. diff --git a/tavern/auth/oauth.go b/tavern/internal/auth/oauth.go similarity index 98% rename from tavern/auth/oauth.go rename to tavern/internal/auth/oauth.go index 5b5d21612..6b16a61de 100644 --- a/tavern/auth/oauth.go +++ b/tavern/internal/auth/oauth.go @@ -12,8 +12,8 @@ import ( "time" "github.com/golang-jwt/jwt" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/user" "golang.org/x/oauth2" ) diff --git a/tavern/auth/oauth_test.go b/tavern/internal/auth/oauth_test.go similarity index 97% rename from tavern/auth/oauth_test.go rename to tavern/internal/auth/oauth_test.go index cc3a5caa7..1cd3ced5c 100644 --- a/tavern/auth/oauth_test.go +++ b/tavern/internal/auth/oauth_test.go @@ -13,9 +13,9 @@ import ( "time" "github.com/golang-jwt/jwt" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent/user" _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tavern/internal/cdn/download.go b/tavern/internal/cdn/download.go index 82279327b..db4c182e9 100644 --- a/tavern/internal/cdn/download.go +++ b/tavern/internal/cdn/download.go @@ -5,8 +5,8 @@ import ( "net/http" "path/filepath" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/file" "github.com/kcarretto/realm/tavern/internal/errors" ) diff --git a/tavern/internal/cdn/download_test.go b/tavern/internal/cdn/download_test.go index 9c0cfa0db..bd9c0234a 100644 --- a/tavern/internal/cdn/download_test.go +++ b/tavern/internal/cdn/download_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" "github.com/kcarretto/realm/tavern/internal/cdn" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" "github.com/kcarretto/realm/tavern/internal/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tavern/internal/cdn/upload.go b/tavern/internal/cdn/upload.go index d9ce8f004..395b1d28b 100644 --- a/tavern/internal/cdn/upload.go +++ b/tavern/internal/cdn/upload.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "net/http" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/file" "github.com/kcarretto/realm/tavern/internal/errors" ) diff --git a/tavern/internal/cdn/upload_test.go b/tavern/internal/cdn/upload_test.go index 21088af62..a7363f16c 100644 --- a/tavern/internal/cdn/upload_test.go +++ b/tavern/internal/cdn/upload_test.go @@ -11,9 +11,9 @@ import ( "net/http/httptest" "testing" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" "github.com/kcarretto/realm/tavern/internal/cdn" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" diff --git a/tavern/ent/beacon.go b/tavern/internal/ent/beacon.go similarity index 99% rename from tavern/ent/beacon.go rename to tavern/internal/ent/beacon.go index 9eb9bd63b..88cc2b59e 100644 --- a/tavern/ent/beacon.go +++ b/tavern/internal/ent/beacon.go @@ -8,7 +8,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" ) // Beacon is the model entity for the Beacon schema. diff --git a/tavern/ent/beacon/beacon.go b/tavern/internal/ent/beacon/beacon.go similarity index 100% rename from tavern/ent/beacon/beacon.go rename to tavern/internal/ent/beacon/beacon.go diff --git a/tavern/ent/beacon/where.go b/tavern/internal/ent/beacon/where.go similarity index 99% rename from tavern/ent/beacon/where.go rename to tavern/internal/ent/beacon/where.go index 1982f776a..a23b02953 100644 --- a/tavern/ent/beacon/where.go +++ b/tavern/internal/ent/beacon/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/beacon_create.go b/tavern/internal/ent/beacon_create.go similarity index 98% rename from tavern/ent/beacon_create.go rename to tavern/internal/ent/beacon_create.go index a15c6b53c..40a027533 100644 --- a/tavern/ent/beacon_create.go +++ b/tavern/internal/ent/beacon_create.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // BeaconCreate is the builder for creating a Beacon entity. diff --git a/tavern/ent/beacon_delete.go b/tavern/internal/ent/beacon_delete.go similarity index 94% rename from tavern/ent/beacon_delete.go rename to tavern/internal/ent/beacon_delete.go index b7b5690a8..39db8e3ae 100644 --- a/tavern/ent/beacon_delete.go +++ b/tavern/internal/ent/beacon_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // BeaconDelete is the builder for deleting a Beacon entity. diff --git a/tavern/ent/beacon_query.go b/tavern/internal/ent/beacon_query.go similarity index 98% rename from tavern/ent/beacon_query.go rename to tavern/internal/ent/beacon_query.go index a6332bf6c..923901480 100644 --- a/tavern/ent/beacon_query.go +++ b/tavern/internal/ent/beacon_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // BeaconQuery is the builder for querying Beacon entities. diff --git a/tavern/ent/beacon_update.go b/tavern/internal/ent/beacon_update.go similarity index 99% rename from tavern/ent/beacon_update.go rename to tavern/internal/ent/beacon_update.go index 988503faa..b52e09f81 100644 --- a/tavern/ent/beacon_update.go +++ b/tavern/internal/ent/beacon_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // BeaconUpdate is the builder for updating Beacon entities. diff --git a/tavern/ent/client.go b/tavern/internal/ent/client.go similarity index 98% rename from tavern/ent/client.go rename to tavern/internal/ent/client.go index 311f23397..310b05abd 100644 --- a/tavern/ent/client.go +++ b/tavern/internal/ent/client.go @@ -8,19 +8,19 @@ import ( "fmt" "log" - "github.com/kcarretto/realm/tavern/ent/migrate" + "github.com/kcarretto/realm/tavern/internal/ent/migrate" "entgo.io/ent" "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // Client is the client that holds all ent builders. diff --git a/tavern/ent/ent.go b/tavern/internal/ent/ent.go similarity index 97% rename from tavern/ent/ent.go rename to tavern/internal/ent/ent.go index 47d857f4e..bbc346262 100644 --- a/tavern/ent/ent.go +++ b/tavern/internal/ent/ent.go @@ -11,13 +11,13 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // ent aliases to avoid import conflicts in user's code. diff --git a/tavern/ent/enttest/enttest.go b/tavern/internal/ent/enttest/enttest.go similarity index 91% rename from tavern/ent/enttest/enttest.go rename to tavern/internal/ent/enttest/enttest.go index a20eed131..89e0bd91c 100644 --- a/tavern/ent/enttest/enttest.go +++ b/tavern/internal/ent/enttest/enttest.go @@ -5,12 +5,12 @@ package enttest import ( "context" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" // required by schema hooks. - _ "github.com/kcarretto/realm/tavern/ent/runtime" + _ "github.com/kcarretto/realm/tavern/internal/ent/runtime" "entgo.io/ent/dialect/sql/schema" - "github.com/kcarretto/realm/tavern/ent/migrate" + "github.com/kcarretto/realm/tavern/internal/ent/migrate" ) type ( diff --git a/tavern/ent/file.go b/tavern/internal/ent/file.go similarity index 98% rename from tavern/ent/file.go rename to tavern/internal/ent/file.go index 21f0abfeb..87ae1767e 100644 --- a/tavern/ent/file.go +++ b/tavern/internal/ent/file.go @@ -8,7 +8,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/file" ) // File is the model entity for the File schema. diff --git a/tavern/ent/file/file.go b/tavern/internal/ent/file/file.go similarity index 97% rename from tavern/ent/file/file.go rename to tavern/internal/ent/file/file.go index 98e1b1ff6..4fd05bdf2 100644 --- a/tavern/ent/file/file.go +++ b/tavern/internal/ent/file/file.go @@ -65,7 +65,7 @@ func ValidColumn(column string) bool { // package on the initialization of the application. Therefore, // it should be imported in the main as follows: // -// import _ "github.com/kcarretto/realm/tavern/ent/runtime" +// import _ "github.com/kcarretto/realm/tavern/internal/ent/runtime" var ( Hooks [1]ent.Hook // DefaultCreatedAt holds the default value on creation for the "created_at" field. diff --git a/tavern/ent/file/where.go b/tavern/internal/ent/file/where.go similarity index 99% rename from tavern/ent/file/where.go rename to tavern/internal/ent/file/where.go index daba25069..486d028bb 100644 --- a/tavern/ent/file/where.go +++ b/tavern/internal/ent/file/where.go @@ -6,7 +6,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/file_create.go b/tavern/internal/ent/file_create.go similarity index 99% rename from tavern/ent/file_create.go rename to tavern/internal/ent/file_create.go index ef83abd17..e5aba4c40 100644 --- a/tavern/ent/file_create.go +++ b/tavern/internal/ent/file_create.go @@ -10,7 +10,7 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/file" ) // FileCreate is the builder for creating a File entity. diff --git a/tavern/ent/file_delete.go b/tavern/internal/ent/file_delete.go similarity index 94% rename from tavern/ent/file_delete.go rename to tavern/internal/ent/file_delete.go index 7dfcc5ea4..225d0e8d9 100644 --- a/tavern/ent/file_delete.go +++ b/tavern/internal/ent/file_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // FileDelete is the builder for deleting a File entity. diff --git a/tavern/ent/file_query.go b/tavern/internal/ent/file_query.go similarity index 99% rename from tavern/ent/file_query.go rename to tavern/internal/ent/file_query.go index 6cabf18c7..55457a936 100644 --- a/tavern/ent/file_query.go +++ b/tavern/internal/ent/file_query.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // FileQuery is the builder for querying File entities. diff --git a/tavern/ent/file_update.go b/tavern/internal/ent/file_update.go similarity index 98% rename from tavern/ent/file_update.go rename to tavern/internal/ent/file_update.go index e036a080d..34c5fc556 100644 --- a/tavern/ent/file_update.go +++ b/tavern/internal/ent/file_update.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // FileUpdate is the builder for updating File entities. diff --git a/tavern/internal/ent/generate.go b/tavern/internal/ent/generate.go new file mode 100644 index 000000000..d72fb28bd --- /dev/null +++ b/tavern/internal/ent/generate.go @@ -0,0 +1,43 @@ +//go:build ignore + +package main + +import ( + "log" + + "entgo.io/contrib/entgql" + "entgo.io/ent/entc" + "entgo.io/ent/entc/gen" +) + +//go:generate go run -mod=mod generate.go +//go:generate /bin/sh -c "cd ../graphql && go run -mod=mod github.com/99designs/gqlgen" +//go:generate /bin/sh -c "cat ../graphql/schema/* > ../graphql/schema.graphql" +//go:generate /bin/sh -c "cp ../graphql/schema.graphql ../www/schema.graphql" +//go:generate /bin/sh -c "cp ../graphql/schema.graphql ../../../implants/lib/tavern/graphql/schema.graphql" +//go:generate /bin/sh -c "cd ../../../implants/lib/tavern && ./codegen.sh" + +func main() { + log.Println("generating entgo") + extensions, err := entgql.NewExtension( + entgql.WithSchemaGenerator(), + entgql.WithWhereInputs(true), + entgql.WithSchemaPath("../graphql/schema/ent.graphql"), + entgql.WithConfigPath("../graphql/gqlgen.yml"), + ) + if err != nil { + log.Fatalf("creating entgql extension: %v", err) + } + opts := []entc.Option{ + entc.Extensions(extensions), + entc.FeatureNames("privacy"), + } + + if err := entc.Generate( + "./schema", + &gen.Config{}, + opts..., + ); err != nil { + log.Fatalf("running ent codegen: %v", err) + } +} diff --git a/tavern/ent/gql_collection.go b/tavern/internal/ent/gql_collection.go similarity index 100% rename from tavern/ent/gql_collection.go rename to tavern/internal/ent/gql_collection.go diff --git a/tavern/ent/gql_edge.go b/tavern/internal/ent/gql_edge.go similarity index 100% rename from tavern/ent/gql_edge.go rename to tavern/internal/ent/gql_edge.go diff --git a/tavern/ent/gql_mutation_input.go b/tavern/internal/ent/gql_mutation_input.go similarity index 98% rename from tavern/ent/gql_mutation_input.go rename to tavern/internal/ent/gql_mutation_input.go index 7258bc59c..97b9b9682 100644 --- a/tavern/ent/gql_mutation_input.go +++ b/tavern/internal/ent/gql_mutation_input.go @@ -3,7 +3,7 @@ package ent import ( - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // UpdateBeaconInput represents a mutation input for updating beacons. diff --git a/tavern/ent/gql_node.go b/tavern/internal/ent/gql_node.go similarity index 96% rename from tavern/ent/gql_node.go rename to tavern/internal/ent/gql_node.go index fe682fc6f..2256469df 100644 --- a/tavern/ent/gql_node.go +++ b/tavern/internal/ent/gql_node.go @@ -14,13 +14,13 @@ import ( "entgo.io/ent/dialect/sql/schema" "github.com/99designs/gqlgen/graphql" "github.com/hashicorp/go-multierror" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" "golang.org/x/sync/semaphore" ) diff --git a/tavern/ent/gql_pagination.go b/tavern/internal/ent/gql_pagination.go similarity index 99% rename from tavern/ent/gql_pagination.go rename to tavern/internal/ent/gql_pagination.go index 6ceb10f9d..3bd3b051f 100644 --- a/tavern/ent/gql_pagination.go +++ b/tavern/internal/ent/gql_pagination.go @@ -14,13 +14,13 @@ import ( "entgo.io/ent/dialect/sql" "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/errcode" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" "github.com/vektah/gqlparser/v2/gqlerror" "github.com/vmihailenco/msgpack/v5" ) diff --git a/tavern/ent/gql_transaction.go b/tavern/internal/ent/gql_transaction.go similarity index 100% rename from tavern/ent/gql_transaction.go rename to tavern/internal/ent/gql_transaction.go diff --git a/tavern/ent/gql_where_input.go b/tavern/internal/ent/gql_where_input.go similarity index 99% rename from tavern/ent/gql_where_input.go rename to tavern/internal/ent/gql_where_input.go index cfee3aafe..261d06ca2 100644 --- a/tavern/ent/gql_where_input.go +++ b/tavern/internal/ent/gql_where_input.go @@ -7,14 +7,14 @@ import ( "fmt" "time" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // BeaconWhereInput represents a where input for filtering Beacon queries. diff --git a/tavern/ent/hook/hook.go b/tavern/internal/ent/hook/hook.go similarity index 99% rename from tavern/ent/hook/hook.go rename to tavern/internal/ent/hook/hook.go index 9da956750..81ca305ea 100644 --- a/tavern/ent/hook/hook.go +++ b/tavern/internal/ent/hook/hook.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" ) // The BeaconFunc type is an adapter to allow the use of ordinary diff --git a/tavern/ent/migrate/migrate.go b/tavern/internal/ent/migrate/migrate.go similarity index 100% rename from tavern/ent/migrate/migrate.go rename to tavern/internal/ent/migrate/migrate.go diff --git a/tavern/ent/migrate/schema.go b/tavern/internal/ent/migrate/schema.go similarity index 100% rename from tavern/ent/migrate/schema.go rename to tavern/internal/ent/migrate/schema.go diff --git a/tavern/ent/mutation.go b/tavern/internal/ent/mutation.go similarity index 99% rename from tavern/ent/mutation.go rename to tavern/internal/ent/mutation.go index 6b89c8eb4..0241f34dc 100644 --- a/tavern/ent/mutation.go +++ b/tavern/internal/ent/mutation.go @@ -11,14 +11,14 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) const ( diff --git a/tavern/ent/predicate/predicate.go b/tavern/internal/ent/predicate/predicate.go similarity index 100% rename from tavern/ent/predicate/predicate.go rename to tavern/internal/ent/predicate/predicate.go diff --git a/tavern/ent/privacy/privacy.go b/tavern/internal/ent/privacy/privacy.go similarity index 99% rename from tavern/ent/privacy/privacy.go rename to tavern/internal/ent/privacy/privacy.go index 6a48a96ca..d1ceaa24c 100644 --- a/tavern/ent/privacy/privacy.go +++ b/tavern/internal/ent/privacy/privacy.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" "entgo.io/ent/privacy" ) diff --git a/tavern/ent/quest.go b/tavern/internal/ent/quest.go similarity index 97% rename from tavern/ent/quest.go rename to tavern/internal/ent/quest.go index f3946075b..b1fe5895f 100644 --- a/tavern/ent/quest.go +++ b/tavern/internal/ent/quest.go @@ -8,10 +8,10 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // Quest is the model entity for the Quest schema. diff --git a/tavern/ent/quest/quest.go b/tavern/internal/ent/quest/quest.go similarity index 100% rename from tavern/ent/quest/quest.go rename to tavern/internal/ent/quest/quest.go diff --git a/tavern/ent/quest/where.go b/tavern/internal/ent/quest/where.go similarity index 99% rename from tavern/ent/quest/where.go rename to tavern/internal/ent/quest/where.go index 5bbf0bba5..f16c8285a 100644 --- a/tavern/ent/quest/where.go +++ b/tavern/internal/ent/quest/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/quest_create.go b/tavern/internal/ent/quest_create.go similarity index 97% rename from tavern/ent/quest_create.go rename to tavern/internal/ent/quest_create.go index f52d4804a..3a3ab6642 100644 --- a/tavern/ent/quest_create.go +++ b/tavern/internal/ent/quest_create.go @@ -10,11 +10,11 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // QuestCreate is the builder for creating a Quest entity. diff --git a/tavern/ent/quest_delete.go b/tavern/internal/ent/quest_delete.go similarity index 94% rename from tavern/ent/quest_delete.go rename to tavern/internal/ent/quest_delete.go index 4e9604bef..9bc1f1be2 100644 --- a/tavern/ent/quest_delete.go +++ b/tavern/internal/ent/quest_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" ) // QuestDelete is the builder for deleting a Quest entity. diff --git a/tavern/ent/quest_query.go b/tavern/internal/ent/quest_query.go similarity index 98% rename from tavern/ent/quest_query.go rename to tavern/internal/ent/quest_query.go index 20e7c3688..7a9a917d8 100644 --- a/tavern/ent/quest_query.go +++ b/tavern/internal/ent/quest_query.go @@ -11,12 +11,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // QuestQuery is the builder for querying Quest entities. diff --git a/tavern/ent/quest_update.go b/tavern/internal/ent/quest_update.go similarity index 98% rename from tavern/ent/quest_update.go rename to tavern/internal/ent/quest_update.go index 979e75f98..b2a6c6941 100644 --- a/tavern/ent/quest_update.go +++ b/tavern/internal/ent/quest_update.go @@ -11,12 +11,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // QuestUpdate is the builder for updating Quest entities. diff --git a/tavern/ent/runtime.go b/tavern/internal/ent/runtime.go similarity index 70% rename from tavern/ent/runtime.go rename to tavern/internal/ent/runtime.go index d543f9470..3881f9547 100644 --- a/tavern/ent/runtime.go +++ b/tavern/internal/ent/runtime.go @@ -2,4 +2,4 @@ package ent -// The schema-stitching logic is generated in github.com/kcarretto/realm/tavern/ent/runtime/runtime.go +// The schema-stitching logic is generated in github.com/kcarretto/realm/tavern/internal/ent/runtime/runtime.go diff --git a/tavern/ent/runtime/runtime.go b/tavern/internal/ent/runtime/runtime.go similarity index 95% rename from tavern/ent/runtime/runtime.go rename to tavern/internal/ent/runtime/runtime.go index b53cfa6ad..2b8ce4379 100644 --- a/tavern/ent/runtime/runtime.go +++ b/tavern/internal/ent/runtime/runtime.go @@ -5,14 +5,14 @@ package runtime import ( "time" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/schema" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/ent/tome" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/schema" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // The init function reads all schema descriptors with runtime code diff --git a/tavern/ent/schema/beacon.go b/tavern/internal/ent/schema/beacon.go similarity index 98% rename from tavern/ent/schema/beacon.go rename to tavern/internal/ent/schema/beacon.go index c62191af4..15ffd3a9e 100644 --- a/tavern/ent/schema/beacon.go +++ b/tavern/internal/ent/schema/beacon.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/kcarretto/realm/tavern/namegen" + "github.com/kcarretto/realm/tavern/internal/namegen" "entgo.io/contrib/entgql" "entgo.io/ent" diff --git a/tavern/ent/schema/file.go b/tavern/internal/ent/schema/file.go similarity index 97% rename from tavern/ent/schema/file.go rename to tavern/internal/ent/schema/file.go index 7fa4e2569..9e7c16679 100644 --- a/tavern/ent/schema/file.go +++ b/tavern/internal/ent/schema/file.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/kcarretto/realm/tavern/ent/hook" + "github.com/kcarretto/realm/tavern/internal/ent/hook" "golang.org/x/crypto/sha3" "entgo.io/contrib/entgql" diff --git a/tavern/ent/schema/file_test.go b/tavern/internal/ent/schema/file_test.go similarity index 92% rename from tavern/ent/schema/file_test.go rename to tavern/internal/ent/schema/file_test.go index 9391bcfe0..e67483898 100644 --- a/tavern/ent/schema/file_test.go +++ b/tavern/internal/ent/schema/file_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" ) diff --git a/tavern/ent/schema/mixin_history.go b/tavern/internal/ent/schema/mixin_history.go similarity index 100% rename from tavern/ent/schema/mixin_history.go rename to tavern/internal/ent/schema/mixin_history.go diff --git a/tavern/ent/schema/quest.go b/tavern/internal/ent/schema/quest.go similarity index 100% rename from tavern/ent/schema/quest.go rename to tavern/internal/ent/schema/quest.go diff --git a/tavern/ent/schema/tag.go b/tavern/internal/ent/schema/tag.go similarity index 100% rename from tavern/ent/schema/tag.go rename to tavern/internal/ent/schema/tag.go diff --git a/tavern/ent/schema/task.go b/tavern/internal/ent/schema/task.go similarity index 100% rename from tavern/ent/schema/task.go rename to tavern/internal/ent/schema/task.go diff --git a/tavern/ent/schema/tome.go b/tavern/internal/ent/schema/tome.go similarity index 97% rename from tavern/ent/schema/tome.go rename to tavern/internal/ent/schema/tome.go index 02b010a5c..12770d4ad 100644 --- a/tavern/ent/schema/tome.go +++ b/tavern/internal/ent/schema/tome.go @@ -10,7 +10,7 @@ import ( "entgo.io/ent/schema" "entgo.io/ent/schema/edge" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/hook" + "github.com/kcarretto/realm/tavern/internal/ent/hook" "golang.org/x/crypto/sha3" ) diff --git a/tavern/ent/schema/user.go b/tavern/internal/ent/schema/user.go similarity index 100% rename from tavern/ent/schema/user.go rename to tavern/internal/ent/schema/user.go diff --git a/tavern/ent/tag.go b/tavern/internal/ent/tag.go similarity index 98% rename from tavern/ent/tag.go rename to tavern/internal/ent/tag.go index 635c67a98..cad6485e6 100644 --- a/tavern/ent/tag.go +++ b/tavern/internal/ent/tag.go @@ -7,7 +7,7 @@ import ( "strings" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // Tag is the model entity for the Tag schema. diff --git a/tavern/ent/tag/tag.go b/tavern/internal/ent/tag/tag.go similarity index 100% rename from tavern/ent/tag/tag.go rename to tavern/internal/ent/tag/tag.go diff --git a/tavern/ent/tag/where.go b/tavern/internal/ent/tag/where.go similarity index 98% rename from tavern/ent/tag/where.go rename to tavern/internal/ent/tag/where.go index 883dcdc81..29af05ec4 100644 --- a/tavern/ent/tag/where.go +++ b/tavern/internal/ent/tag/where.go @@ -5,7 +5,7 @@ package tag import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/tag_create.go b/tavern/internal/ent/tag_create.go similarity index 98% rename from tavern/ent/tag_create.go rename to tavern/internal/ent/tag_create.go index 1c1f235ad..931731890 100644 --- a/tavern/ent/tag_create.go +++ b/tavern/internal/ent/tag_create.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // TagCreate is the builder for creating a Tag entity. diff --git a/tavern/ent/tag_delete.go b/tavern/internal/ent/tag_delete.go similarity index 94% rename from tavern/ent/tag_delete.go rename to tavern/internal/ent/tag_delete.go index 90090f0b0..7624275e4 100644 --- a/tavern/ent/tag_delete.go +++ b/tavern/internal/ent/tag_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // TagDelete is the builder for deleting a Tag entity. diff --git a/tavern/ent/tag_query.go b/tavern/internal/ent/tag_query.go similarity index 99% rename from tavern/ent/tag_query.go rename to tavern/internal/ent/tag_query.go index b628e2642..6a1a6afeb 100644 --- a/tavern/ent/tag_query.go +++ b/tavern/internal/ent/tag_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // TagQuery is the builder for querying Tag entities. diff --git a/tavern/ent/tag_update.go b/tavern/internal/ent/tag_update.go similarity index 98% rename from tavern/ent/tag_update.go rename to tavern/internal/ent/tag_update.go index 152c2baea..268425464 100644 --- a/tavern/ent/tag_update.go +++ b/tavern/internal/ent/tag_update.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // TagUpdate is the builder for updating Tag entities. diff --git a/tavern/ent/task.go b/tavern/internal/ent/task.go similarity index 97% rename from tavern/ent/task.go rename to tavern/internal/ent/task.go index 421a7d576..df3aa0bb6 100644 --- a/tavern/ent/task.go +++ b/tavern/internal/ent/task.go @@ -8,9 +8,9 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // Task is the model entity for the Task schema. diff --git a/tavern/ent/task/task.go b/tavern/internal/ent/task/task.go similarity index 100% rename from tavern/ent/task/task.go rename to tavern/internal/ent/task/task.go diff --git a/tavern/ent/task/where.go b/tavern/internal/ent/task/where.go similarity index 99% rename from tavern/ent/task/where.go rename to tavern/internal/ent/task/where.go index 124c94e6b..a9b009e38 100644 --- a/tavern/ent/task/where.go +++ b/tavern/internal/ent/task/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/task_create.go b/tavern/internal/ent/task_create.go similarity index 98% rename from tavern/ent/task_create.go rename to tavern/internal/ent/task_create.go index 75b81e169..c96f1a0ce 100644 --- a/tavern/ent/task_create.go +++ b/tavern/internal/ent/task_create.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // TaskCreate is the builder for creating a Task entity. diff --git a/tavern/ent/task_delete.go b/tavern/internal/ent/task_delete.go similarity index 94% rename from tavern/ent/task_delete.go rename to tavern/internal/ent/task_delete.go index 861528977..be8aa9f3d 100644 --- a/tavern/ent/task_delete.go +++ b/tavern/internal/ent/task_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // TaskDelete is the builder for deleting a Task entity. diff --git a/tavern/ent/task_query.go b/tavern/internal/ent/task_query.go similarity index 98% rename from tavern/ent/task_query.go rename to tavern/internal/ent/task_query.go index 860d3f31e..33ddfaed0 100644 --- a/tavern/ent/task_query.go +++ b/tavern/internal/ent/task_query.go @@ -10,10 +10,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // TaskQuery is the builder for querying Task entities. diff --git a/tavern/ent/task_update.go b/tavern/internal/ent/task_update.go similarity index 98% rename from tavern/ent/task_update.go rename to tavern/internal/ent/task_update.go index 8039de4c8..d25415d35 100644 --- a/tavern/ent/task_update.go +++ b/tavern/internal/ent/task_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/quest" - "github.com/kcarretto/realm/tavern/ent/task" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/quest" + "github.com/kcarretto/realm/tavern/internal/ent/task" ) // TaskUpdate is the builder for updating Task entities. diff --git a/tavern/ent/tome.go b/tavern/internal/ent/tome.go similarity index 99% rename from tavern/ent/tome.go rename to tavern/internal/ent/tome.go index 097f7f080..bf40b0ce3 100644 --- a/tavern/ent/tome.go +++ b/tavern/internal/ent/tome.go @@ -8,7 +8,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/tome" ) // Tome is the model entity for the Tome schema. diff --git a/tavern/ent/tome/tome.go b/tavern/internal/ent/tome/tome.go similarity index 97% rename from tavern/ent/tome/tome.go rename to tavern/internal/ent/tome/tome.go index 8aace3377..08ac248f4 100644 --- a/tavern/ent/tome/tome.go +++ b/tavern/internal/ent/tome/tome.go @@ -66,7 +66,7 @@ func ValidColumn(column string) bool { // package on the initialization of the application. Therefore, // it should be imported in the main as follows: // -// import _ "github.com/kcarretto/realm/tavern/ent/runtime" +// import _ "github.com/kcarretto/realm/tavern/internal/ent/runtime" var ( Hooks [1]ent.Hook // DefaultCreatedAt holds the default value on creation for the "created_at" field. diff --git a/tavern/ent/tome/where.go b/tavern/internal/ent/tome/where.go similarity index 99% rename from tavern/ent/tome/where.go rename to tavern/internal/ent/tome/where.go index 0f865f58d..c4946fac4 100644 --- a/tavern/ent/tome/where.go +++ b/tavern/internal/ent/tome/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/tome_create.go b/tavern/internal/ent/tome_create.go similarity index 98% rename from tavern/ent/tome_create.go rename to tavern/internal/ent/tome_create.go index ef26f456a..81ab762fe 100644 --- a/tavern/ent/tome_create.go +++ b/tavern/internal/ent/tome_create.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/tome" ) // TomeCreate is the builder for creating a Tome entity. diff --git a/tavern/ent/tome_delete.go b/tavern/internal/ent/tome_delete.go similarity index 94% rename from tavern/ent/tome_delete.go rename to tavern/internal/ent/tome_delete.go index 376369e16..c6ea3e02e 100644 --- a/tavern/ent/tome_delete.go +++ b/tavern/internal/ent/tome_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tome" ) // TomeDelete is the builder for deleting a Tome entity. diff --git a/tavern/ent/tome_query.go b/tavern/internal/ent/tome_query.go similarity index 99% rename from tavern/ent/tome_query.go rename to tavern/internal/ent/tome_query.go index 501f67806..42d3869a8 100644 --- a/tavern/ent/tome_query.go +++ b/tavern/internal/ent/tome_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tome" ) // TomeQuery is the builder for querying Tome entities. diff --git a/tavern/ent/tome_update.go b/tavern/internal/ent/tome_update.go similarity index 98% rename from tavern/ent/tome_update.go rename to tavern/internal/ent/tome_update.go index 4890f28be..341e495d1 100644 --- a/tavern/ent/tome_update.go +++ b/tavern/internal/ent/tome_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/tome" ) // TomeUpdate is the builder for updating Tome entities. diff --git a/tavern/ent/tx.go b/tavern/internal/ent/tx.go similarity index 100% rename from tavern/ent/tx.go rename to tavern/internal/ent/tx.go diff --git a/tavern/ent/user.go b/tavern/internal/ent/user.go similarity index 98% rename from tavern/ent/user.go rename to tavern/internal/ent/user.go index d38accecd..83dc63213 100644 --- a/tavern/ent/user.go +++ b/tavern/internal/ent/user.go @@ -7,7 +7,7 @@ import ( "strings" "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // User is the model entity for the User schema. diff --git a/tavern/ent/user/user.go b/tavern/internal/ent/user/user.go similarity index 100% rename from tavern/ent/user/user.go rename to tavern/internal/ent/user/user.go diff --git a/tavern/ent/user/where.go b/tavern/internal/ent/user/where.go similarity index 99% rename from tavern/ent/user/where.go rename to tavern/internal/ent/user/where.go index e24ac83b9..9bc642d27 100644 --- a/tavern/ent/user/where.go +++ b/tavern/internal/ent/user/where.go @@ -4,7 +4,7 @@ package user import ( "entgo.io/ent/dialect/sql" - "github.com/kcarretto/realm/tavern/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" ) // ID filters vertices based on their ID field. diff --git a/tavern/ent/user_create.go b/tavern/internal/ent/user_create.go similarity index 99% rename from tavern/ent/user_create.go rename to tavern/internal/ent/user_create.go index a7f2311e4..cbfcc3bec 100644 --- a/tavern/ent/user_create.go +++ b/tavern/internal/ent/user_create.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // UserCreate is the builder for creating a User entity. diff --git a/tavern/ent/user_delete.go b/tavern/internal/ent/user_delete.go similarity index 94% rename from tavern/ent/user_delete.go rename to tavern/internal/ent/user_delete.go index 72d58c91f..c6def70bf 100644 --- a/tavern/ent/user_delete.go +++ b/tavern/internal/ent/user_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // UserDelete is the builder for deleting a User entity. diff --git a/tavern/ent/user_query.go b/tavern/internal/ent/user_query.go similarity index 99% rename from tavern/ent/user_query.go rename to tavern/internal/ent/user_query.go index da2a5bc1d..156adbe21 100644 --- a/tavern/ent/user_query.go +++ b/tavern/internal/ent/user_query.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // UserQuery is the builder for querying User entities. diff --git a/tavern/ent/user_update.go b/tavern/internal/ent/user_update.go similarity index 98% rename from tavern/ent/user_update.go rename to tavern/internal/ent/user_update.go index 152287199..2d651cfce 100644 --- a/tavern/ent/user_update.go +++ b/tavern/internal/ent/user_update.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/kcarretto/realm/tavern/ent/predicate" - "github.com/kcarretto/realm/tavern/ent/user" + "github.com/kcarretto/realm/tavern/internal/ent/predicate" + "github.com/kcarretto/realm/tavern/internal/ent/user" ) // UserUpdate is the builder for updating User entities. diff --git a/tavern/graphql/api_test.go b/tavern/internal/graphql/api_test.go similarity index 95% rename from tavern/graphql/api_test.go rename to tavern/internal/graphql/api_test.go index a3197a37e..72471357b 100644 --- a/tavern/graphql/api_test.go +++ b/tavern/internal/graphql/api_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tavern/graphql/beacon_test.go b/tavern/internal/graphql/beacon_test.go similarity index 96% rename from tavern/graphql/beacon_test.go rename to tavern/internal/graphql/beacon_test.go index e44a484d3..8461d83e2 100644 --- a/tavern/graphql/beacon_test.go +++ b/tavern/internal/graphql/beacon_test.go @@ -8,12 +8,12 @@ import ( "github.com/99designs/gqlgen/client" "github.com/99designs/gqlgen/graphql/handler" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/graphql/bundle.go b/tavern/internal/graphql/bundle.go similarity index 95% rename from tavern/graphql/bundle.go rename to tavern/internal/graphql/bundle.go index 88e287305..5098ed915 100644 --- a/tavern/graphql/bundle.go +++ b/tavern/internal/graphql/bundle.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/file" "golang.org/x/crypto/sha3" ) diff --git a/tavern/graphql/ent.resolvers.go b/tavern/internal/graphql/ent.resolvers.go similarity index 87% rename from tavern/graphql/ent.resolvers.go rename to tavern/internal/graphql/ent.resolvers.go index d1ca800b0..523e1aef5 100644 --- a/tavern/graphql/ent.resolvers.go +++ b/tavern/internal/graphql/ent.resolvers.go @@ -7,8 +7,8 @@ package graphql import ( "context" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/graphql/generated" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/graphql/generated" ) // Node is the resolver for the node field. diff --git a/tavern/graphql/generated/directives.generated.go b/tavern/internal/graphql/generated/directives.generated.go similarity index 85% rename from tavern/graphql/generated/directives.generated.go rename to tavern/internal/graphql/generated/directives.generated.go index f6de16ecb..9f0dbc0f2 100644 --- a/tavern/graphql/generated/directives.generated.go +++ b/tavern/internal/graphql/generated/directives.generated.go @@ -6,7 +6,7 @@ import ( "context" "github.com/99designs/gqlgen/graphql" - "github.com/kcarretto/realm/tavern/graphql/models" + "github.com/kcarretto/realm/tavern/internal/graphql/models" "github.com/vektah/gqlparser/v2/ast" ) @@ -22,7 +22,7 @@ func (ec *executionContext) dir_requireRole_args(ctx context.Context, rawArgs ma var arg0 models.Role if tmp, ok := rawArgs["role"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("role")) - arg0, err = ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, tmp) + arg0, err = ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, tmp) if err != nil { return nil, err } @@ -55,13 +55,13 @@ func (ec *executionContext) dir_requireRole_args(ctx context.Context, rawArgs ma // region ***************************** type.gotpl ***************************** -func (ec *executionContext) unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx context.Context, v interface{}) (models.Role, error) { +func (ec *executionContext) unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx context.Context, v interface{}) (models.Role, error) { var res models.Role err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx context.Context, sel ast.SelectionSet, v models.Role) graphql.Marshaler { +func (ec *executionContext) marshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx context.Context, sel ast.SelectionSet, v models.Role) graphql.Marshaler { return v } diff --git a/tavern/graphql/generated/ent.generated.go b/tavern/internal/graphql/generated/ent.generated.go similarity index 94% rename from tavern/graphql/generated/ent.generated.go rename to tavern/internal/graphql/generated/ent.generated.go index 8a288807d..8e30a2c91 100644 --- a/tavern/graphql/generated/ent.generated.go +++ b/tavern/internal/graphql/generated/ent.generated.go @@ -13,9 +13,9 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/introspection" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/tag" "github.com/vektah/gqlparser/v2/ast" ) @@ -57,7 +57,7 @@ func (ec *executionContext) field_Query_beacons_args(ctx context.Context, rawArg var arg0 *ent.BeaconWhereInput if tmp, ok := rawArgs["where"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("where")) - arg0, err = ec.unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInput(ctx, tmp) + arg0, err = ec.unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInput(ctx, tmp) if err != nil { return nil, err } @@ -72,7 +72,7 @@ func (ec *executionContext) field_Query_files_args(ctx context.Context, rawArgs var arg0 *ent.FileWhereInput if tmp, ok := rawArgs["where"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("where")) - arg0, err = ec.unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInput(ctx, tmp) + arg0, err = ec.unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInput(ctx, tmp) if err != nil { return nil, err } @@ -117,7 +117,7 @@ func (ec *executionContext) field_Query_quests_args(ctx context.Context, rawArgs var arg0 *ent.QuestWhereInput if tmp, ok := rawArgs["where"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("where")) - arg0, err = ec.unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInput(ctx, tmp) + arg0, err = ec.unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInput(ctx, tmp) if err != nil { return nil, err } @@ -132,7 +132,7 @@ func (ec *executionContext) field_Query_tags_args(ctx context.Context, rawArgs m var arg0 *ent.TagWhereInput if tmp, ok := rawArgs["where"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("where")) - arg0, err = ec.unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInput(ctx, tmp) + arg0, err = ec.unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInput(ctx, tmp) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func (ec *executionContext) field_Query_tomes_args(ctx context.Context, rawArgs var arg0 *ent.TomeWhereInput if tmp, ok := rawArgs["where"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("where")) - arg0, err = ec.unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInput(ctx, tmp) + arg0, err = ec.unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInput(ctx, tmp) if err != nil { return nil, err } @@ -162,7 +162,7 @@ func (ec *executionContext) field_Query_users_args(ctx context.Context, rawArgs var arg0 *ent.UserWhereInput if tmp, ok := rawArgs["where"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("where")) - arg0, err = ec.unmarshalOUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInput(ctx, tmp) + arg0, err = ec.unmarshalOUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInput(ctx, tmp) if err != nil { return nil, err } @@ -544,7 +544,7 @@ func (ec *executionContext) _Beacon_hostPlatform(ctx context.Context, field grap } res := resTmp.(beacon.HostPlatform) fc.Result = res - return ec.marshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx, field.Selections, res) + return ec.marshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Beacon_hostPlatform(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -626,7 +626,7 @@ func (ec *executionContext) _Beacon_tags(ctx context.Context, field graphql.Coll } res := resTmp.([]*ent.Tag) fc.Result = res - return ec.marshalOTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagᚄ(ctx, field.Selections, res) + return ec.marshalOTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Beacon_tags(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -677,7 +677,7 @@ func (ec *executionContext) _Beacon_tasks(ctx context.Context, field graphql.Col } res := resTmp.([]*ent.Task) fc.Result = res - return ec.marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskᚄ(ctx, field.Selections, res) + return ec.marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Beacon_tasks(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1092,7 +1092,7 @@ func (ec *executionContext) _PageInfo_startCursor(ctx context.Context, field gra } res := resTmp.(*ent.Cursor) fc.Result = res - return ec.marshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCursor(ctx, field.Selections, res) + return ec.marshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCursor(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_PageInfo_startCursor(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1133,7 +1133,7 @@ func (ec *executionContext) _PageInfo_endCursor(ctx context.Context, field graph } res := resTmp.(*ent.Cursor) fc.Result = res - return ec.marshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCursor(ctx, field.Selections, res) + return ec.marshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCursor(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_PageInfo_endCursor(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1174,7 +1174,7 @@ func (ec *executionContext) _Query_node(ctx context.Context, field graphql.Colle } res := resTmp.(ent.Noder) fc.Result = res - return ec.marshalONode2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐNoder(ctx, field.Selections, res) + return ec.marshalONode2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐNoder(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_node(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1229,7 +1229,7 @@ func (ec *executionContext) _Query_nodes(ctx context.Context, field graphql.Coll } res := resTmp.([]ent.Noder) fc.Result = res - return ec.marshalNNode2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐNoder(ctx, field.Selections, res) + return ec.marshalNNode2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐNoder(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_nodes(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1284,7 +1284,7 @@ func (ec *executionContext) _Query_files(ctx context.Context, field graphql.Coll } res := resTmp.([]*ent.File) fc.Result = res - return ec.marshalNFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileᚄ(ctx, field.Selections, res) + return ec.marshalNFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_files(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1353,7 +1353,7 @@ func (ec *executionContext) _Query_quests(ctx context.Context, field graphql.Col } res := resTmp.([]*ent.Quest) fc.Result = res - return ec.marshalNQuest2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestᚄ(ctx, field.Selections, res) + return ec.marshalNQuest2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_quests(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1428,7 +1428,7 @@ func (ec *executionContext) _Query_beacons(ctx context.Context, field graphql.Co } res := resTmp.([]*ent.Beacon) fc.Result = res - return ec.marshalNBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconᚄ(ctx, field.Selections, res) + return ec.marshalNBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_beacons(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1509,7 +1509,7 @@ func (ec *executionContext) _Query_tags(ctx context.Context, field graphql.Colle } res := resTmp.([]*ent.Tag) fc.Result = res - return ec.marshalNTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagᚄ(ctx, field.Selections, res) + return ec.marshalNTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_tags(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1574,7 +1574,7 @@ func (ec *executionContext) _Query_tomes(ctx context.Context, field graphql.Coll } res := resTmp.([]*ent.Tome) fc.Result = res - return ec.marshalNTome2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeᚄ(ctx, field.Selections, res) + return ec.marshalNTome2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_tomes(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -1647,7 +1647,7 @@ func (ec *executionContext) _Query_users(ctx context.Context, field graphql.Coll } res := resTmp.([]*ent.User) fc.Result = res - return ec.marshalNUser2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserᚄ(ctx, field.Selections, res) + return ec.marshalNUser2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_users(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2060,7 +2060,7 @@ func (ec *executionContext) _Quest_tome(ctx context.Context, field graphql.Colle } res := resTmp.(*ent.Tome) fc.Result = res - return ec.marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTome(ctx, field.Selections, res) + return ec.marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTome(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Quest_tome(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2119,7 +2119,7 @@ func (ec *executionContext) _Quest_bundle(ctx context.Context, field graphql.Col } res := resTmp.(*ent.File) fc.Result = res - return ec.marshalOFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFile(ctx, field.Selections, res) + return ec.marshalOFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFile(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Quest_bundle(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2174,7 +2174,7 @@ func (ec *executionContext) _Quest_tasks(ctx context.Context, field graphql.Coll } res := resTmp.([]*ent.Task) fc.Result = res - return ec.marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskᚄ(ctx, field.Selections, res) + return ec.marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Quest_tasks(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2237,7 +2237,7 @@ func (ec *executionContext) _Quest_creator(ctx context.Context, field graphql.Co } res := resTmp.(*ent.User) fc.Result = res - return ec.marshalOUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUser(ctx, field.Selections, res) + return ec.marshalOUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUser(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Quest_creator(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2381,7 +2381,7 @@ func (ec *executionContext) _Tag_kind(ctx context.Context, field graphql.Collect } res := resTmp.(tag.Kind) fc.Result = res - return ec.marshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, field.Selections, res) + return ec.marshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Tag_kind(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2422,7 +2422,7 @@ func (ec *executionContext) _Tag_beacons(ctx context.Context, field graphql.Coll } res := resTmp.([]*ent.Beacon) fc.Result = res - return ec.marshalOBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconᚄ(ctx, field.Selections, res) + return ec.marshalOBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Tag_beacons(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2829,7 +2829,7 @@ func (ec *executionContext) _Task_quest(ctx context.Context, field graphql.Colle } res := resTmp.(*ent.Quest) fc.Result = res - return ec.marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuest(ctx, field.Selections, res) + return ec.marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuest(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Task_quest(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2893,7 +2893,7 @@ func (ec *executionContext) _Task_beacon(ctx context.Context, field graphql.Coll } res := resTmp.(*ent.Beacon) fc.Result = res - return ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeacon(ctx, field.Selections, res) + return ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeacon(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Task_beacon(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3265,7 +3265,7 @@ func (ec *executionContext) _Tome_files(ctx context.Context, field graphql.Colle } res := resTmp.([]*ent.File) fc.Result = res - return ec.marshalOFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileᚄ(ctx, field.Selections, res) + return ec.marshalOFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Tome_files(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3541,7 +3541,7 @@ func (ec *executionContext) unmarshalInputBeaconOrder(ctx context.Context, obj i var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("direction")) - it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx, v) + it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx, v) if err != nil { return it, err } @@ -3549,7 +3549,7 @@ func (ec *executionContext) unmarshalInputBeaconOrder(ctx context.Context, obj i var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - it.Field, err = ec.unmarshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconOrderField(ctx, v) + it.Field, err = ec.unmarshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconOrderField(ctx, v) if err != nil { return it, err } @@ -3577,7 +3577,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInput(ctx, v) + it.Not, err = ec.unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInput(ctx, v) if err != nil { return it, err } @@ -3585,7 +3585,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -3593,7 +3593,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -4473,7 +4473,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hostPlatform")) - it.HostPlatform, err = ec.unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx, v) + it.HostPlatform, err = ec.unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx, v) if err != nil { return it, err } @@ -4481,7 +4481,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hostPlatformNEQ")) - it.HostPlatformNEQ, err = ec.unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx, v) + it.HostPlatformNEQ, err = ec.unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx, v) if err != nil { return it, err } @@ -4489,7 +4489,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hostPlatformIn")) - it.HostPlatformIn, err = ec.unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatformᚄ(ctx, v) + it.HostPlatformIn, err = ec.unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatformᚄ(ctx, v) if err != nil { return it, err } @@ -4497,7 +4497,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hostPlatformNotIn")) - it.HostPlatformNotIn, err = ec.unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatformᚄ(ctx, v) + it.HostPlatformNotIn, err = ec.unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatformᚄ(ctx, v) if err != nil { return it, err } @@ -4593,7 +4593,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasTagsWith")) - it.HasTagsWith, err = ec.unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInputᚄ(ctx, v) + it.HasTagsWith, err = ec.unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -4609,7 +4609,7 @@ func (ec *executionContext) unmarshalInputBeaconWhereInput(ctx context.Context, var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasTasksWith")) - it.HasTasksWith, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInputᚄ(ctx, v) + it.HasTasksWith, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -4689,7 +4689,7 @@ func (ec *executionContext) unmarshalInputCreateTagInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("kind")) - it.Kind, err = ec.unmarshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, v) + it.Kind, err = ec.unmarshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, v) if err != nil { return it, err } @@ -4789,7 +4789,7 @@ func (ec *executionContext) unmarshalInputFileOrder(ctx context.Context, obj int var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("direction")) - it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx, v) + it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx, v) if err != nil { return it, err } @@ -4797,7 +4797,7 @@ func (ec *executionContext) unmarshalInputFileOrder(ctx context.Context, obj int var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - it.Field, err = ec.unmarshalNFileOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileOrderField(ctx, v) + it.Field, err = ec.unmarshalNFileOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileOrderField(ctx, v) if err != nil { return it, err } @@ -4825,7 +4825,7 @@ func (ec *executionContext) unmarshalInputFileWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInput(ctx, v) + it.Not, err = ec.unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInput(ctx, v) if err != nil { return it, err } @@ -4833,7 +4833,7 @@ func (ec *executionContext) unmarshalInputFileWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -4841,7 +4841,7 @@ func (ec *executionContext) unmarshalInputFileWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5337,7 +5337,7 @@ func (ec *executionContext) unmarshalInputQuestOrder(ctx context.Context, obj in var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("direction")) - it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx, v) + it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx, v) if err != nil { return it, err } @@ -5345,7 +5345,7 @@ func (ec *executionContext) unmarshalInputQuestOrder(ctx context.Context, obj in var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - it.Field, err = ec.unmarshalNQuestOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestOrderField(ctx, v) + it.Field, err = ec.unmarshalNQuestOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestOrderField(ctx, v) if err != nil { return it, err } @@ -5373,7 +5373,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInput(ctx, v) + it.Not, err = ec.unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInput(ctx, v) if err != nil { return it, err } @@ -5381,7 +5381,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5389,7 +5389,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5821,7 +5821,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasTomeWith")) - it.HasTomeWith, err = ec.unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInputᚄ(ctx, v) + it.HasTomeWith, err = ec.unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5837,7 +5837,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasBundleWith")) - it.HasBundleWith, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInputᚄ(ctx, v) + it.HasBundleWith, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5853,7 +5853,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasTasksWith")) - it.HasTasksWith, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInputᚄ(ctx, v) + it.HasTasksWith, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5869,7 +5869,7 @@ func (ec *executionContext) unmarshalInputQuestWhereInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasCreatorWith")) - it.HasCreatorWith, err = ec.unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInputᚄ(ctx, v) + it.HasCreatorWith, err = ec.unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5901,7 +5901,7 @@ func (ec *executionContext) unmarshalInputTagOrder(ctx context.Context, obj inte var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("direction")) - it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx, v) + it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx, v) if err != nil { return it, err } @@ -5909,7 +5909,7 @@ func (ec *executionContext) unmarshalInputTagOrder(ctx context.Context, obj inte var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - it.Field, err = ec.unmarshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagOrderField(ctx, v) + it.Field, err = ec.unmarshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagOrderField(ctx, v) if err != nil { return it, err } @@ -5937,7 +5937,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInput(ctx, v) + it.Not, err = ec.unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInput(ctx, v) if err != nil { return it, err } @@ -5945,7 +5945,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -5953,7 +5953,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -6129,7 +6129,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("kind")) - it.Kind, err = ec.unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, v) + it.Kind, err = ec.unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, v) if err != nil { return it, err } @@ -6137,7 +6137,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("kindNEQ")) - it.KindNEQ, err = ec.unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, v) + it.KindNEQ, err = ec.unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, v) if err != nil { return it, err } @@ -6145,7 +6145,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("kindIn")) - it.KindIn, err = ec.unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKindᚄ(ctx, v) + it.KindIn, err = ec.unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKindᚄ(ctx, v) if err != nil { return it, err } @@ -6153,7 +6153,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("kindNotIn")) - it.KindNotIn, err = ec.unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKindᚄ(ctx, v) + it.KindNotIn, err = ec.unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKindᚄ(ctx, v) if err != nil { return it, err } @@ -6169,7 +6169,7 @@ func (ec *executionContext) unmarshalInputTagWhereInput(ctx context.Context, obj var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasBeaconsWith")) - it.HasBeaconsWith, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInputᚄ(ctx, v) + it.HasBeaconsWith, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -6201,7 +6201,7 @@ func (ec *executionContext) unmarshalInputTaskOrder(ctx context.Context, obj int var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("direction")) - it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx, v) + it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx, v) if err != nil { return it, err } @@ -6209,7 +6209,7 @@ func (ec *executionContext) unmarshalInputTaskOrder(ctx context.Context, obj int var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - it.Field, err = ec.unmarshalNTaskOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskOrderField(ctx, v) + it.Field, err = ec.unmarshalNTaskOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskOrderField(ctx, v) if err != nil { return it, err } @@ -6237,7 +6237,7 @@ func (ec *executionContext) unmarshalInputTaskWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInput(ctx, v) + it.Not, err = ec.unmarshalOTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInput(ctx, v) if err != nil { return it, err } @@ -6245,7 +6245,7 @@ func (ec *executionContext) unmarshalInputTaskWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -6253,7 +6253,7 @@ func (ec *executionContext) unmarshalInputTaskWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -6941,7 +6941,7 @@ func (ec *executionContext) unmarshalInputTaskWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasQuestWith")) - it.HasQuestWith, err = ec.unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInputᚄ(ctx, v) + it.HasQuestWith, err = ec.unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -6957,7 +6957,7 @@ func (ec *executionContext) unmarshalInputTaskWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasBeaconWith")) - it.HasBeaconWith, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInputᚄ(ctx, v) + it.HasBeaconWith, err = ec.unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -6989,7 +6989,7 @@ func (ec *executionContext) unmarshalInputTomeOrder(ctx context.Context, obj int var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("direction")) - it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx, v) + it.Direction, err = ec.unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx, v) if err != nil { return it, err } @@ -6997,7 +6997,7 @@ func (ec *executionContext) unmarshalInputTomeOrder(ctx context.Context, obj int var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - it.Field, err = ec.unmarshalNTomeOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeOrderField(ctx, v) + it.Field, err = ec.unmarshalNTomeOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeOrderField(ctx, v) if err != nil { return it, err } @@ -7025,7 +7025,7 @@ func (ec *executionContext) unmarshalInputTomeWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInput(ctx, v) + it.Not, err = ec.unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInput(ctx, v) if err != nil { return it, err } @@ -7033,7 +7033,7 @@ func (ec *executionContext) unmarshalInputTomeWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -7041,7 +7041,7 @@ func (ec *executionContext) unmarshalInputTomeWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -7681,7 +7681,7 @@ func (ec *executionContext) unmarshalInputTomeWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hasFilesWith")) - it.HasFilesWith, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInputᚄ(ctx, v) + it.HasFilesWith, err = ec.unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -7785,7 +7785,7 @@ func (ec *executionContext) unmarshalInputUpdateTagInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("kind")) - it.Kind, err = ec.unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, v) + it.Kind, err = ec.unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, v) if err != nil { return it, err } @@ -7889,7 +7889,7 @@ func (ec *executionContext) unmarshalInputUserWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("not")) - it.Not, err = ec.unmarshalOUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInput(ctx, v) + it.Not, err = ec.unmarshalOUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInput(ctx, v) if err != nil { return it, err } @@ -7897,7 +7897,7 @@ func (ec *executionContext) unmarshalInputUserWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("and")) - it.And, err = ec.unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInputᚄ(ctx, v) + it.And, err = ec.unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -7905,7 +7905,7 @@ func (ec *executionContext) unmarshalInputUserWhereInput(ctx context.Context, ob var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("or")) - it.Or, err = ec.unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInputᚄ(ctx, v) + it.Or, err = ec.unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInputᚄ(ctx, v) if err != nil { return it, err } @@ -9136,11 +9136,11 @@ func (ec *executionContext) _User(ctx context.Context, sel ast.SelectionSet, obj // region ***************************** type.gotpl ***************************** -func (ec *executionContext) marshalNBeacon2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeacon(ctx context.Context, sel ast.SelectionSet, v ent.Beacon) graphql.Marshaler { +func (ec *executionContext) marshalNBeacon2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeacon(ctx context.Context, sel ast.SelectionSet, v ent.Beacon) graphql.Marshaler { return ec._Beacon(ctx, sel, &v) } -func (ec *executionContext) marshalNBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Beacon) graphql.Marshaler { +func (ec *executionContext) marshalNBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Beacon) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9164,7 +9164,7 @@ func (ec *executionContext) marshalNBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋreal if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeacon(ctx, sel, v[i]) + ret[i] = ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeacon(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9184,7 +9184,7 @@ func (ec *executionContext) marshalNBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋreal return ret } -func (ec *executionContext) marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeacon(ctx context.Context, sel ast.SelectionSet, v *ent.Beacon) graphql.Marshaler { +func (ec *executionContext) marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeacon(ctx context.Context, sel ast.SelectionSet, v *ent.Beacon) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9194,23 +9194,23 @@ func (ec *executionContext) marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealm return ec._Beacon(ctx, sel, v) } -func (ec *executionContext) unmarshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx context.Context, v interface{}) (beacon.HostPlatform, error) { +func (ec *executionContext) unmarshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx context.Context, v interface{}) (beacon.HostPlatform, error) { var res beacon.HostPlatform err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx context.Context, sel ast.SelectionSet, v beacon.HostPlatform) graphql.Marshaler { +func (ec *executionContext) marshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx context.Context, sel ast.SelectionSet, v beacon.HostPlatform) graphql.Marshaler { return v } -func (ec *executionContext) unmarshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconOrderField(ctx context.Context, v interface{}) (*ent.BeaconOrderField, error) { +func (ec *executionContext) unmarshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconOrderField(ctx context.Context, v interface{}) (*ent.BeaconOrderField, error) { var res = new(ent.BeaconOrderField) err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.BeaconOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.BeaconOrderField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9220,27 +9220,27 @@ func (ec *executionContext) marshalNBeaconOrderField2ᚖgithubᚗcomᚋkcarretto return v } -func (ec *executionContext) unmarshalNBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInput(ctx context.Context, v interface{}) (*ent.BeaconWhereInput, error) { +func (ec *executionContext) unmarshalNBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInput(ctx context.Context, v interface{}) (*ent.BeaconWhereInput, error) { res, err := ec.unmarshalInputBeaconWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNCreateQuestInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCreateQuestInput(ctx context.Context, v interface{}) (ent.CreateQuestInput, error) { +func (ec *executionContext) unmarshalNCreateQuestInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCreateQuestInput(ctx context.Context, v interface{}) (ent.CreateQuestInput, error) { res, err := ec.unmarshalInputCreateQuestInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNCreateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCreateTagInput(ctx context.Context, v interface{}) (ent.CreateTagInput, error) { +func (ec *executionContext) unmarshalNCreateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCreateTagInput(ctx context.Context, v interface{}) (ent.CreateTagInput, error) { res, err := ec.unmarshalInputCreateTagInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNCreateTomeInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCreateTomeInput(ctx context.Context, v interface{}) (ent.CreateTomeInput, error) { +func (ec *executionContext) unmarshalNCreateTomeInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCreateTomeInput(ctx context.Context, v interface{}) (ent.CreateTomeInput, error) { res, err := ec.unmarshalInputCreateTomeInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.File) graphql.Marshaler { +func (ec *executionContext) marshalNFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.File) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9264,7 +9264,7 @@ func (ec *executionContext) marshalNFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFile(ctx, sel, v[i]) + ret[i] = ec.marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFile(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9284,7 +9284,7 @@ func (ec *executionContext) marshalNFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFile(ctx context.Context, sel ast.SelectionSet, v *ent.File) graphql.Marshaler { +func (ec *executionContext) marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFile(ctx context.Context, sel ast.SelectionSet, v *ent.File) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9294,13 +9294,13 @@ func (ec *executionContext) marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋt return ec._File(ctx, sel, v) } -func (ec *executionContext) unmarshalNFileOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileOrderField(ctx context.Context, v interface{}) (*ent.FileOrderField, error) { +func (ec *executionContext) unmarshalNFileOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileOrderField(ctx context.Context, v interface{}) (*ent.FileOrderField, error) { var res = new(ent.FileOrderField) err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNFileOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.FileOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNFileOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.FileOrderField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9310,12 +9310,12 @@ func (ec *executionContext) marshalNFileOrderField2ᚖgithubᚗcomᚋkcarretto return v } -func (ec *executionContext) unmarshalNFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInput(ctx context.Context, v interface{}) (*ent.FileWhereInput, error) { +func (ec *executionContext) unmarshalNFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInput(ctx context.Context, v interface{}) (*ent.FileWhereInput, error) { res, err := ec.unmarshalInputFileWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNNode2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐNoder(ctx context.Context, sel ast.SelectionSet, v []ent.Noder) graphql.Marshaler { +func (ec *executionContext) marshalNNode2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐNoder(ctx context.Context, sel ast.SelectionSet, v []ent.Noder) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9339,7 +9339,7 @@ func (ec *executionContext) marshalNNode2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋt if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalONode2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐNoder(ctx, sel, v[i]) + ret[i] = ec.marshalONode2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐNoder(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9353,17 +9353,17 @@ func (ec *executionContext) marshalNNode2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋt return ret } -func (ec *executionContext) unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx context.Context, v interface{}) (ent.OrderDirection, error) { +func (ec *executionContext) unmarshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx context.Context, v interface{}) (ent.OrderDirection, error) { var res ent.OrderDirection err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐOrderDirection(ctx context.Context, sel ast.SelectionSet, v ent.OrderDirection) graphql.Marshaler { +func (ec *executionContext) marshalNOrderDirection2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐOrderDirection(ctx context.Context, sel ast.SelectionSet, v ent.OrderDirection) graphql.Marshaler { return v } -func (ec *executionContext) marshalNQuest2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Quest) graphql.Marshaler { +func (ec *executionContext) marshalNQuest2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Quest) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9387,7 +9387,7 @@ func (ec *executionContext) marshalNQuest2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuest(ctx, sel, v[i]) + ret[i] = ec.marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuest(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9407,7 +9407,7 @@ func (ec *executionContext) marshalNQuest2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuest(ctx context.Context, sel ast.SelectionSet, v *ent.Quest) graphql.Marshaler { +func (ec *executionContext) marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuest(ctx context.Context, sel ast.SelectionSet, v *ent.Quest) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9417,13 +9417,13 @@ func (ec *executionContext) marshalNQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋ return ec._Quest(ctx, sel, v) } -func (ec *executionContext) unmarshalNQuestOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestOrderField(ctx context.Context, v interface{}) (*ent.QuestOrderField, error) { +func (ec *executionContext) unmarshalNQuestOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestOrderField(ctx context.Context, v interface{}) (*ent.QuestOrderField, error) { var res = new(ent.QuestOrderField) err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNQuestOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.QuestOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNQuestOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.QuestOrderField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9433,16 +9433,16 @@ func (ec *executionContext) marshalNQuestOrderField2ᚖgithubᚗcomᚋkcarretto return v } -func (ec *executionContext) unmarshalNQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInput(ctx context.Context, v interface{}) (*ent.QuestWhereInput, error) { +func (ec *executionContext) unmarshalNQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInput(ctx context.Context, v interface{}) (*ent.QuestWhereInput, error) { res, err := ec.unmarshalInputQuestWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTag2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTag(ctx context.Context, sel ast.SelectionSet, v ent.Tag) graphql.Marshaler { +func (ec *executionContext) marshalNTag2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTag(ctx context.Context, sel ast.SelectionSet, v ent.Tag) graphql.Marshaler { return ec._Tag(ctx, sel, &v) } -func (ec *executionContext) marshalNTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Tag) graphql.Marshaler { +func (ec *executionContext) marshalNTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Tag) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9466,7 +9466,7 @@ func (ec *executionContext) marshalNTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTag(ctx, sel, v[i]) + ret[i] = ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTag(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9486,7 +9486,7 @@ func (ec *executionContext) marshalNTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTag(ctx context.Context, sel ast.SelectionSet, v *ent.Tag) graphql.Marshaler { +func (ec *executionContext) marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTag(ctx context.Context, sel ast.SelectionSet, v *ent.Tag) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9496,23 +9496,23 @@ func (ec *executionContext) marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋta return ec._Tag(ctx, sel, v) } -func (ec *executionContext) unmarshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx context.Context, v interface{}) (tag.Kind, error) { +func (ec *executionContext) unmarshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx context.Context, v interface{}) (tag.Kind, error) { var res tag.Kind err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx context.Context, sel ast.SelectionSet, v tag.Kind) graphql.Marshaler { +func (ec *executionContext) marshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx context.Context, sel ast.SelectionSet, v tag.Kind) graphql.Marshaler { return v } -func (ec *executionContext) unmarshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagOrderField(ctx context.Context, v interface{}) (*ent.TagOrderField, error) { +func (ec *executionContext) unmarshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagOrderField(ctx context.Context, v interface{}) (*ent.TagOrderField, error) { var res = new(ent.TagOrderField) err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.TagOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.TagOrderField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9522,12 +9522,12 @@ func (ec *executionContext) marshalNTagOrderField2ᚖgithubᚗcomᚋkcarrettoᚋ return v } -func (ec *executionContext) unmarshalNTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInput(ctx context.Context, v interface{}) (*ent.TagWhereInput, error) { +func (ec *executionContext) unmarshalNTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInput(ctx context.Context, v interface{}) (*ent.TagWhereInput, error) { res, err := ec.unmarshalInputTagWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Task) graphql.Marshaler { +func (ec *executionContext) marshalNTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Task) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9551,7 +9551,7 @@ func (ec *executionContext) marshalNTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTask(ctx, sel, v[i]) + ret[i] = ec.marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTask(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9571,7 +9571,7 @@ func (ec *executionContext) marshalNTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTask(ctx context.Context, sel ast.SelectionSet, v *ent.Task) graphql.Marshaler { +func (ec *executionContext) marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTask(ctx context.Context, sel ast.SelectionSet, v *ent.Task) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9581,13 +9581,13 @@ func (ec *executionContext) marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋt return ec._Task(ctx, sel, v) } -func (ec *executionContext) unmarshalNTaskOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskOrderField(ctx context.Context, v interface{}) (*ent.TaskOrderField, error) { +func (ec *executionContext) unmarshalNTaskOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskOrderField(ctx context.Context, v interface{}) (*ent.TaskOrderField, error) { var res = new(ent.TaskOrderField) err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTaskOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.TaskOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNTaskOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.TaskOrderField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9597,16 +9597,16 @@ func (ec *executionContext) marshalNTaskOrderField2ᚖgithubᚗcomᚋkcarretto return v } -func (ec *executionContext) unmarshalNTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInput(ctx context.Context, v interface{}) (*ent.TaskWhereInput, error) { +func (ec *executionContext) unmarshalNTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInput(ctx context.Context, v interface{}) (*ent.TaskWhereInput, error) { res, err := ec.unmarshalInputTaskWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTome2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTome(ctx context.Context, sel ast.SelectionSet, v ent.Tome) graphql.Marshaler { +func (ec *executionContext) marshalNTome2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTome(ctx context.Context, sel ast.SelectionSet, v ent.Tome) graphql.Marshaler { return ec._Tome(ctx, sel, &v) } -func (ec *executionContext) marshalNTome2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Tome) graphql.Marshaler { +func (ec *executionContext) marshalNTome2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Tome) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9630,7 +9630,7 @@ func (ec *executionContext) marshalNTome2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTome(ctx, sel, v[i]) + ret[i] = ec.marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTome(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9650,7 +9650,7 @@ func (ec *executionContext) marshalNTome2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTome(ctx context.Context, sel ast.SelectionSet, v *ent.Tome) graphql.Marshaler { +func (ec *executionContext) marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTome(ctx context.Context, sel ast.SelectionSet, v *ent.Tome) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9660,13 +9660,13 @@ func (ec *executionContext) marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋt return ec._Tome(ctx, sel, v) } -func (ec *executionContext) unmarshalNTomeOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeOrderField(ctx context.Context, v interface{}) (*ent.TomeOrderField, error) { +func (ec *executionContext) unmarshalNTomeOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeOrderField(ctx context.Context, v interface{}) (*ent.TomeOrderField, error) { var res = new(ent.TomeOrderField) err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNTomeOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.TomeOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNTomeOrderField2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeOrderField(ctx context.Context, sel ast.SelectionSet, v *ent.TomeOrderField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9676,27 +9676,27 @@ func (ec *executionContext) marshalNTomeOrderField2ᚖgithubᚗcomᚋkcarretto return v } -func (ec *executionContext) unmarshalNTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInput(ctx context.Context, v interface{}) (*ent.TomeWhereInput, error) { +func (ec *executionContext) unmarshalNTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInput(ctx context.Context, v interface{}) (*ent.TomeWhereInput, error) { res, err := ec.unmarshalInputTomeWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNUpdateBeaconInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUpdateBeaconInput(ctx context.Context, v interface{}) (ent.UpdateBeaconInput, error) { +func (ec *executionContext) unmarshalNUpdateBeaconInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUpdateBeaconInput(ctx context.Context, v interface{}) (ent.UpdateBeaconInput, error) { res, err := ec.unmarshalInputUpdateBeaconInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNUpdateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUpdateTagInput(ctx context.Context, v interface{}) (ent.UpdateTagInput, error) { +func (ec *executionContext) unmarshalNUpdateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUpdateTagInput(ctx context.Context, v interface{}) (ent.UpdateTagInput, error) { res, err := ec.unmarshalInputUpdateTagInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNUpdateUserInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUpdateUserInput(ctx context.Context, v interface{}) (ent.UpdateUserInput, error) { +func (ec *executionContext) unmarshalNUpdateUserInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUpdateUserInput(ctx context.Context, v interface{}) (ent.UpdateUserInput, error) { res, err := ec.unmarshalInputUpdateUserInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNUser2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.User) graphql.Marshaler { +func (ec *executionContext) marshalNUser2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.User) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -9720,7 +9720,7 @@ func (ec *executionContext) marshalNUser2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUser(ctx, sel, v[i]) + ret[i] = ec.marshalNUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUser(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9740,7 +9740,7 @@ func (ec *executionContext) marshalNUser2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalNUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUser(ctx context.Context, sel ast.SelectionSet, v *ent.User) graphql.Marshaler { +func (ec *executionContext) marshalNUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUser(ctx context.Context, sel ast.SelectionSet, v *ent.User) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9750,12 +9750,12 @@ func (ec *executionContext) marshalNUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋt return ec._User(ctx, sel, v) } -func (ec *executionContext) unmarshalNUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInput(ctx context.Context, v interface{}) (*ent.UserWhereInput, error) { +func (ec *executionContext) unmarshalNUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInput(ctx context.Context, v interface{}) (*ent.UserWhereInput, error) { res, err := ec.unmarshalInputUserWhereInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Beacon) graphql.Marshaler { +func (ec *executionContext) marshalOBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Beacon) graphql.Marshaler { if v == nil { return graphql.Null } @@ -9782,7 +9782,7 @@ func (ec *executionContext) marshalOBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋreal if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeacon(ctx, sel, v[i]) + ret[i] = ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeacon(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9802,7 +9802,7 @@ func (ec *executionContext) marshalOBeacon2ᚕᚖgithubᚗcomᚋkcarrettoᚋreal return ret } -func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatformᚄ(ctx context.Context, v interface{}) ([]beacon.HostPlatform, error) { +func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatformᚄ(ctx context.Context, v interface{}) ([]beacon.HostPlatform, error) { if v == nil { return nil, nil } @@ -9814,7 +9814,7 @@ func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarr res := make([]beacon.HostPlatform, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx, vSlice[i]) + res[i], err = ec.unmarshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx, vSlice[i]) if err != nil { return nil, err } @@ -9822,7 +9822,7 @@ func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarr return res, nil } -func (ec *executionContext) marshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatformᚄ(ctx context.Context, sel ast.SelectionSet, v []beacon.HostPlatform) graphql.Marshaler { +func (ec *executionContext) marshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatformᚄ(ctx context.Context, sel ast.SelectionSet, v []beacon.HostPlatform) graphql.Marshaler { if v == nil { return graphql.Null } @@ -9849,7 +9849,7 @@ func (ec *executionContext) marshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarret if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx, sel, v[i]) + ret[i] = ec.marshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9869,7 +9869,7 @@ func (ec *executionContext) marshalOBeaconHostPlatform2ᚕgithubᚗcomᚋkcarret return ret } -func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx context.Context, v interface{}) (*beacon.HostPlatform, error) { +func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx context.Context, v interface{}) (*beacon.HostPlatform, error) { if v == nil { return nil, nil } @@ -9878,14 +9878,14 @@ func (ec *executionContext) unmarshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarr return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx context.Context, sel ast.SelectionSet, v *beacon.HostPlatform) graphql.Marshaler { +func (ec *executionContext) marshalOBeaconHostPlatform2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx context.Context, sel ast.SelectionSet, v *beacon.HostPlatform) graphql.Marshaler { if v == nil { return graphql.Null } return v } -func (ec *executionContext) unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.BeaconWhereInput, error) { +func (ec *executionContext) unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.BeaconWhereInput, error) { if v == nil { return nil, nil } @@ -9897,7 +9897,7 @@ func (ec *executionContext) unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcar res := make([]*ent.BeaconWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -9905,7 +9905,7 @@ func (ec *executionContext) unmarshalOBeaconWhereInput2ᚕᚖgithubᚗcomᚋkcar return res, nil } -func (ec *executionContext) unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeaconWhereInput(ctx context.Context, v interface{}) (*ent.BeaconWhereInput, error) { +func (ec *executionContext) unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeaconWhereInput(ctx context.Context, v interface{}) (*ent.BeaconWhereInput, error) { if v == nil { return nil, nil } @@ -9913,7 +9913,7 @@ func (ec *executionContext) unmarshalOBeaconWhereInput2ᚖgithubᚗcomᚋkcarret return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCursor(ctx context.Context, v interface{}) (*ent.Cursor, error) { +func (ec *executionContext) unmarshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCursor(ctx context.Context, v interface{}) (*ent.Cursor, error) { if v == nil { return nil, nil } @@ -9922,14 +9922,14 @@ func (ec *executionContext) unmarshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealm return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCursor(ctx context.Context, sel ast.SelectionSet, v *ent.Cursor) graphql.Marshaler { +func (ec *executionContext) marshalOCursor2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCursor(ctx context.Context, sel ast.SelectionSet, v *ent.Cursor) graphql.Marshaler { if v == nil { return graphql.Null } return v } -func (ec *executionContext) marshalOFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.File) graphql.Marshaler { +func (ec *executionContext) marshalOFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.File) graphql.Marshaler { if v == nil { return graphql.Null } @@ -9956,7 +9956,7 @@ func (ec *executionContext) marshalOFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFile(ctx, sel, v[i]) + ret[i] = ec.marshalNFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFile(ctx, sel, v[i]) } if isLen1 { f(i) @@ -9976,14 +9976,14 @@ func (ec *executionContext) marshalOFile2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalOFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFile(ctx context.Context, sel ast.SelectionSet, v *ent.File) graphql.Marshaler { +func (ec *executionContext) marshalOFile2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFile(ctx context.Context, sel ast.SelectionSet, v *ent.File) graphql.Marshaler { if v == nil { return graphql.Null } return ec._File(ctx, sel, v) } -func (ec *executionContext) unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.FileWhereInput, error) { +func (ec *executionContext) unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.FileWhereInput, error) { if v == nil { return nil, nil } @@ -9995,7 +9995,7 @@ func (ec *executionContext) unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarre res := make([]*ent.FileWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10003,7 +10003,7 @@ func (ec *executionContext) unmarshalOFileWhereInput2ᚕᚖgithubᚗcomᚋkcarre return res, nil } -func (ec *executionContext) unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐFileWhereInput(ctx context.Context, v interface{}) (*ent.FileWhereInput, error) { +func (ec *executionContext) unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐFileWhereInput(ctx context.Context, v interface{}) (*ent.FileWhereInput, error) { if v == nil { return nil, nil } @@ -10011,21 +10011,21 @@ func (ec *executionContext) unmarshalOFileWhereInput2ᚖgithubᚗcomᚋkcarretto return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalONode2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐNoder(ctx context.Context, sel ast.SelectionSet, v ent.Noder) graphql.Marshaler { +func (ec *executionContext) marshalONode2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐNoder(ctx context.Context, sel ast.SelectionSet, v ent.Noder) graphql.Marshaler { if v == nil { return graphql.Null } return ec._Node(ctx, sel, v) } -func (ec *executionContext) marshalOQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuest(ctx context.Context, sel ast.SelectionSet, v *ent.Quest) graphql.Marshaler { +func (ec *executionContext) marshalOQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuest(ctx context.Context, sel ast.SelectionSet, v *ent.Quest) graphql.Marshaler { if v == nil { return graphql.Null } return ec._Quest(ctx, sel, v) } -func (ec *executionContext) unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.QuestWhereInput, error) { +func (ec *executionContext) unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.QuestWhereInput, error) { if v == nil { return nil, nil } @@ -10037,7 +10037,7 @@ func (ec *executionContext) unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarr res := make([]*ent.QuestWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10045,7 +10045,7 @@ func (ec *executionContext) unmarshalOQuestWhereInput2ᚕᚖgithubᚗcomᚋkcarr return res, nil } -func (ec *executionContext) unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuestWhereInput(ctx context.Context, v interface{}) (*ent.QuestWhereInput, error) { +func (ec *executionContext) unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuestWhereInput(ctx context.Context, v interface{}) (*ent.QuestWhereInput, error) { if v == nil { return nil, nil } @@ -10053,7 +10053,7 @@ func (ec *executionContext) unmarshalOQuestWhereInput2ᚖgithubᚗcomᚋkcarrett return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Tag) graphql.Marshaler { +func (ec *executionContext) marshalOTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Tag) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10080,7 +10080,7 @@ func (ec *executionContext) marshalOTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTag(ctx, sel, v[i]) + ret[i] = ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTag(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10100,7 +10100,7 @@ func (ec *executionContext) marshalOTag2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKindᚄ(ctx context.Context, v interface{}) ([]tag.Kind, error) { +func (ec *executionContext) unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKindᚄ(ctx context.Context, v interface{}) ([]tag.Kind, error) { if v == nil { return nil, nil } @@ -10112,7 +10112,7 @@ func (ec *executionContext) unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋreal res := make([]tag.Kind, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, vSlice[i]) + res[i], err = ec.unmarshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10120,7 +10120,7 @@ func (ec *executionContext) unmarshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋreal return res, nil } -func (ec *executionContext) marshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKindᚄ(ctx context.Context, sel ast.SelectionSet, v []tag.Kind) graphql.Marshaler { +func (ec *executionContext) marshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKindᚄ(ctx context.Context, sel ast.SelectionSet, v []tag.Kind) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10147,7 +10147,7 @@ func (ec *executionContext) marshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx, sel, v[i]) + ret[i] = ec.marshalNTagKind2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10167,7 +10167,7 @@ func (ec *executionContext) marshalOTagKind2ᚕgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx context.Context, v interface{}) (*tag.Kind, error) { +func (ec *executionContext) unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx context.Context, v interface{}) (*tag.Kind, error) { if v == nil { return nil, nil } @@ -10176,14 +10176,14 @@ func (ec *executionContext) unmarshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋreal return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋtagᚐKind(ctx context.Context, sel ast.SelectionSet, v *tag.Kind) graphql.Marshaler { +func (ec *executionContext) marshalOTagKind2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋtagᚐKind(ctx context.Context, sel ast.SelectionSet, v *tag.Kind) graphql.Marshaler { if v == nil { return graphql.Null } return v } -func (ec *executionContext) unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.TagWhereInput, error) { +func (ec *executionContext) unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.TagWhereInput, error) { if v == nil { return nil, nil } @@ -10195,7 +10195,7 @@ func (ec *executionContext) unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarret res := make([]*ent.TagWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10203,7 +10203,7 @@ func (ec *executionContext) unmarshalOTagWhereInput2ᚕᚖgithubᚗcomᚋkcarret return res, nil } -func (ec *executionContext) unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTagWhereInput(ctx context.Context, v interface{}) (*ent.TagWhereInput, error) { +func (ec *executionContext) unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTagWhereInput(ctx context.Context, v interface{}) (*ent.TagWhereInput, error) { if v == nil { return nil, nil } @@ -10211,7 +10211,7 @@ func (ec *executionContext) unmarshalOTagWhereInput2ᚖgithubᚗcomᚋkcarretto return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Task) graphql.Marshaler { +func (ec *executionContext) marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskᚄ(ctx context.Context, sel ast.SelectionSet, v []*ent.Task) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10238,7 +10238,7 @@ func (ec *executionContext) marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTask(ctx, sel, v[i]) + ret[i] = ec.marshalNTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTask(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10258,14 +10258,14 @@ func (ec *executionContext) marshalOTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealm return ret } -func (ec *executionContext) marshalOTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTask(ctx context.Context, sel ast.SelectionSet, v *ent.Task) graphql.Marshaler { +func (ec *executionContext) marshalOTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTask(ctx context.Context, sel ast.SelectionSet, v *ent.Task) graphql.Marshaler { if v == nil { return graphql.Null } return ec._Task(ctx, sel, v) } -func (ec *executionContext) unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.TaskWhereInput, error) { +func (ec *executionContext) unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.TaskWhereInput, error) { if v == nil { return nil, nil } @@ -10277,7 +10277,7 @@ func (ec *executionContext) unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarre res := make([]*ent.TaskWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10285,7 +10285,7 @@ func (ec *executionContext) unmarshalOTaskWhereInput2ᚕᚖgithubᚗcomᚋkcarre return res, nil } -func (ec *executionContext) unmarshalOTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskWhereInput(ctx context.Context, v interface{}) (*ent.TaskWhereInput, error) { +func (ec *executionContext) unmarshalOTaskWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskWhereInput(ctx context.Context, v interface{}) (*ent.TaskWhereInput, error) { if v == nil { return nil, nil } @@ -10293,7 +10293,7 @@ func (ec *executionContext) unmarshalOTaskWhereInput2ᚖgithubᚗcomᚋkcarretto return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.TomeWhereInput, error) { +func (ec *executionContext) unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.TomeWhereInput, error) { if v == nil { return nil, nil } @@ -10305,7 +10305,7 @@ func (ec *executionContext) unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarre res := make([]*ent.TomeWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10313,7 +10313,7 @@ func (ec *executionContext) unmarshalOTomeWhereInput2ᚕᚖgithubᚗcomᚋkcarre return res, nil } -func (ec *executionContext) unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTomeWhereInput(ctx context.Context, v interface{}) (*ent.TomeWhereInput, error) { +func (ec *executionContext) unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTomeWhereInput(ctx context.Context, v interface{}) (*ent.TomeWhereInput, error) { if v == nil { return nil, nil } @@ -10321,14 +10321,14 @@ func (ec *executionContext) unmarshalOTomeWhereInput2ᚖgithubᚗcomᚋkcarretto return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUser(ctx context.Context, sel ast.SelectionSet, v *ent.User) graphql.Marshaler { +func (ec *executionContext) marshalOUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUser(ctx context.Context, sel ast.SelectionSet, v *ent.User) graphql.Marshaler { if v == nil { return graphql.Null } return ec._User(ctx, sel, v) } -func (ec *executionContext) unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.UserWhereInput, error) { +func (ec *executionContext) unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInputᚄ(ctx context.Context, v interface{}) ([]*ent.UserWhereInput, error) { if v == nil { return nil, nil } @@ -10340,7 +10340,7 @@ func (ec *executionContext) unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarre res := make([]*ent.UserWhereInput, len(vSlice)) for i := range vSlice { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithIndex(i)) - res[i], err = ec.unmarshalNUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInput(ctx, vSlice[i]) + res[i], err = ec.unmarshalNUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInput(ctx, vSlice[i]) if err != nil { return nil, err } @@ -10348,7 +10348,7 @@ func (ec *executionContext) unmarshalOUserWhereInput2ᚕᚖgithubᚗcomᚋkcarre return res, nil } -func (ec *executionContext) unmarshalOUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUserWhereInput(ctx context.Context, v interface{}) (*ent.UserWhereInput, error) { +func (ec *executionContext) unmarshalOUserWhereInput2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUserWhereInput(ctx context.Context, v interface{}) (*ent.UserWhereInput, error) { if v == nil { return nil, nil } diff --git a/tavern/graphql/generated/inputs.generated.go b/tavern/internal/graphql/generated/inputs.generated.go similarity index 92% rename from tavern/graphql/generated/inputs.generated.go rename to tavern/internal/graphql/generated/inputs.generated.go index 2958949ae..a9647e1c2 100644 --- a/tavern/graphql/generated/inputs.generated.go +++ b/tavern/internal/graphql/generated/inputs.generated.go @@ -6,7 +6,7 @@ import ( "context" "github.com/99designs/gqlgen/graphql" - "github.com/kcarretto/realm/tavern/graphql/models" + "github.com/kcarretto/realm/tavern/internal/graphql/models" ) // region ************************** generated!.gotpl ************************** @@ -61,7 +61,7 @@ func (ec *executionContext) unmarshalInputClaimTasksInput(ctx context.Context, o var err error ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("hostPlatform")) - it.HostPlatform, err = ec.unmarshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚋbeaconᚐHostPlatform(ctx, v) + it.HostPlatform, err = ec.unmarshalNBeaconHostPlatform2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚋbeaconᚐHostPlatform(ctx, v) if err != nil { return it, err } @@ -175,12 +175,12 @@ func (ec *executionContext) unmarshalInputSubmitTaskResultInput(ctx context.Cont // region ***************************** type.gotpl ***************************** -func (ec *executionContext) unmarshalNClaimTasksInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐClaimTasksInput(ctx context.Context, v interface{}) (models.ClaimTasksInput, error) { +func (ec *executionContext) unmarshalNClaimTasksInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐClaimTasksInput(ctx context.Context, v interface{}) (models.ClaimTasksInput, error) { res, err := ec.unmarshalInputClaimTasksInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNSubmitTaskResultInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐSubmitTaskResultInput(ctx context.Context, v interface{}) (models.SubmitTaskResultInput, error) { +func (ec *executionContext) unmarshalNSubmitTaskResultInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐSubmitTaskResultInput(ctx context.Context, v interface{}) (models.SubmitTaskResultInput, error) { res, err := ec.unmarshalInputSubmitTaskResultInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } diff --git a/tavern/graphql/generated/mutation.generated.go b/tavern/internal/graphql/generated/mutation.generated.go similarity index 94% rename from tavern/graphql/generated/mutation.generated.go rename to tavern/internal/graphql/generated/mutation.generated.go index 5a6cf07a0..53b390daa 100644 --- a/tavern/graphql/generated/mutation.generated.go +++ b/tavern/internal/graphql/generated/mutation.generated.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/99designs/gqlgen/graphql" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/graphql/models" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/graphql/models" "github.com/vektah/gqlparser/v2/ast" ) @@ -37,7 +37,7 @@ func (ec *executionContext) field_Mutation_claimTasks_args(ctx context.Context, var arg0 models.ClaimTasksInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg0, err = ec.unmarshalNClaimTasksInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐClaimTasksInput(ctx, tmp) + arg0, err = ec.unmarshalNClaimTasksInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐClaimTasksInput(ctx, tmp) if err != nil { return nil, err } @@ -61,7 +61,7 @@ func (ec *executionContext) field_Mutation_createQuest_args(ctx context.Context, var arg1 ent.CreateQuestInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg1, err = ec.unmarshalNCreateQuestInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCreateQuestInput(ctx, tmp) + arg1, err = ec.unmarshalNCreateQuestInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCreateQuestInput(ctx, tmp) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (ec *executionContext) field_Mutation_createTag_args(ctx context.Context, r var arg0 ent.CreateTagInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg0, err = ec.unmarshalNCreateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCreateTagInput(ctx, tmp) + arg0, err = ec.unmarshalNCreateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCreateTagInput(ctx, tmp) if err != nil { return nil, err } @@ -91,7 +91,7 @@ func (ec *executionContext) field_Mutation_createTome_args(ctx context.Context, var arg0 ent.CreateTomeInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg0, err = ec.unmarshalNCreateTomeInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐCreateTomeInput(ctx, tmp) + arg0, err = ec.unmarshalNCreateTomeInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐCreateTomeInput(ctx, tmp) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func (ec *executionContext) field_Mutation_submitTaskResult_args(ctx context.Con var arg0 models.SubmitTaskResultInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg0, err = ec.unmarshalNSubmitTaskResultInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐSubmitTaskResultInput(ctx, tmp) + arg0, err = ec.unmarshalNSubmitTaskResultInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐSubmitTaskResultInput(ctx, tmp) if err != nil { return nil, err } @@ -130,7 +130,7 @@ func (ec *executionContext) field_Mutation_updateBeacon_args(ctx context.Context var arg1 ent.UpdateBeaconInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg1, err = ec.unmarshalNUpdateBeaconInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUpdateBeaconInput(ctx, tmp) + arg1, err = ec.unmarshalNUpdateBeaconInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUpdateBeaconInput(ctx, tmp) if err != nil { return nil, err } @@ -154,7 +154,7 @@ func (ec *executionContext) field_Mutation_updateTag_args(ctx context.Context, r var arg1 ent.UpdateTagInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg1, err = ec.unmarshalNUpdateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUpdateTagInput(ctx, tmp) + arg1, err = ec.unmarshalNUpdateTagInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUpdateTagInput(ctx, tmp) if err != nil { return nil, err } @@ -178,7 +178,7 @@ func (ec *executionContext) field_Mutation_updateUser_args(ctx context.Context, var arg1 ent.UpdateUserInput if tmp, ok := rawArgs["input"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("input")) - arg1, err = ec.unmarshalNUpdateUserInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUpdateUserInput(ctx, tmp) + arg1, err = ec.unmarshalNUpdateUserInput2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUpdateUserInput(ctx, tmp) if err != nil { return nil, err } @@ -213,7 +213,7 @@ func (ec *executionContext) _Mutation_createQuest(ctx context.Context, field gra return ec.resolvers.Mutation().CreateQuest(rctx, fc.Args["beaconIDs"].([]int), fc.Args["input"].(ent.CreateQuestInput)) } directive1 := func(ctx context.Context) (interface{}, error) { - role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, "USER") + role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, "USER") if err != nil { return nil, err } @@ -233,7 +233,7 @@ func (ec *executionContext) _Mutation_createQuest(ctx context.Context, field gra if data, ok := tmp.(*ent.Quest); ok { return data, nil } - return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/ent.Quest`, tmp) + return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/internal/ent.Quest`, tmp) }) if err != nil { ec.Error(ctx, err) @@ -244,7 +244,7 @@ func (ec *executionContext) _Mutation_createQuest(ctx context.Context, field gra } res := resTmp.(*ent.Quest) fc.Result = res - return ec.marshalOQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐQuest(ctx, field.Selections, res) + return ec.marshalOQuest2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐQuest(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_createQuest(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -309,7 +309,7 @@ func (ec *executionContext) _Mutation_updateBeacon(ctx context.Context, field gr return ec.resolvers.Mutation().UpdateBeacon(rctx, fc.Args["beaconID"].(int), fc.Args["input"].(ent.UpdateBeaconInput)) } directive1 := func(ctx context.Context) (interface{}, error) { - role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, "USER") + role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, "USER") if err != nil { return nil, err } @@ -329,7 +329,7 @@ func (ec *executionContext) _Mutation_updateBeacon(ctx context.Context, field gr if data, ok := tmp.(*ent.Beacon); ok { return data, nil } - return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/ent.Beacon`, tmp) + return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/internal/ent.Beacon`, tmp) }) if err != nil { ec.Error(ctx, err) @@ -343,7 +343,7 @@ func (ec *executionContext) _Mutation_updateBeacon(ctx context.Context, field gr } res := resTmp.(*ent.Beacon) fc.Result = res - return ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐBeacon(ctx, field.Selections, res) + return ec.marshalNBeacon2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐBeacon(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_updateBeacon(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -414,7 +414,7 @@ func (ec *executionContext) _Mutation_createTag(ctx context.Context, field graph return ec.resolvers.Mutation().CreateTag(rctx, fc.Args["input"].(ent.CreateTagInput)) } directive1 := func(ctx context.Context) (interface{}, error) { - role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, "ADMIN") + role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, "ADMIN") if err != nil { return nil, err } @@ -434,7 +434,7 @@ func (ec *executionContext) _Mutation_createTag(ctx context.Context, field graph if data, ok := tmp.(*ent.Tag); ok { return data, nil } - return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/ent.Tag`, tmp) + return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/internal/ent.Tag`, tmp) }) if err != nil { ec.Error(ctx, err) @@ -448,7 +448,7 @@ func (ec *executionContext) _Mutation_createTag(ctx context.Context, field graph } res := resTmp.(*ent.Tag) fc.Result = res - return ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTag(ctx, field.Selections, res) + return ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTag(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_createTag(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -503,7 +503,7 @@ func (ec *executionContext) _Mutation_updateTag(ctx context.Context, field graph return ec.resolvers.Mutation().UpdateTag(rctx, fc.Args["tagID"].(int), fc.Args["input"].(ent.UpdateTagInput)) } directive1 := func(ctx context.Context) (interface{}, error) { - role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, "USER") + role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, "USER") if err != nil { return nil, err } @@ -523,7 +523,7 @@ func (ec *executionContext) _Mutation_updateTag(ctx context.Context, field graph if data, ok := tmp.(*ent.Tag); ok { return data, nil } - return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/ent.Tag`, tmp) + return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/internal/ent.Tag`, tmp) }) if err != nil { ec.Error(ctx, err) @@ -537,7 +537,7 @@ func (ec *executionContext) _Mutation_updateTag(ctx context.Context, field graph } res := resTmp.(*ent.Tag) fc.Result = res - return ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTag(ctx, field.Selections, res) + return ec.marshalNTag2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTag(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_updateTag(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -602,7 +602,7 @@ func (ec *executionContext) _Mutation_claimTasks(ctx context.Context, field grap } res := resTmp.([]*ent.Task) fc.Result = res - return ec.marshalNTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTaskᚄ(ctx, field.Selections, res) + return ec.marshalNTask2ᚕᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTaskᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_claimTasks(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -676,7 +676,7 @@ func (ec *executionContext) _Mutation_submitTaskResult(ctx context.Context, fiel } res := resTmp.(*ent.Task) fc.Result = res - return ec.marshalOTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTask(ctx, field.Selections, res) + return ec.marshalOTask2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTask(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_submitTaskResult(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -743,7 +743,7 @@ func (ec *executionContext) _Mutation_createTome(ctx context.Context, field grap return ec.resolvers.Mutation().CreateTome(rctx, fc.Args["input"].(ent.CreateTomeInput)) } directive1 := func(ctx context.Context) (interface{}, error) { - role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, "USER") + role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, "USER") if err != nil { return nil, err } @@ -763,7 +763,7 @@ func (ec *executionContext) _Mutation_createTome(ctx context.Context, field grap if data, ok := tmp.(*ent.Tome); ok { return data, nil } - return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/ent.Tome`, tmp) + return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/internal/ent.Tome`, tmp) }) if err != nil { ec.Error(ctx, err) @@ -777,7 +777,7 @@ func (ec *executionContext) _Mutation_createTome(ctx context.Context, field grap } res := resTmp.(*ent.Tome) fc.Result = res - return ec.marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐTome(ctx, field.Selections, res) + return ec.marshalNTome2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐTome(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_createTome(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -840,7 +840,7 @@ func (ec *executionContext) _Mutation_updateUser(ctx context.Context, field grap return ec.resolvers.Mutation().UpdateUser(rctx, fc.Args["userID"].(int), fc.Args["input"].(ent.UpdateUserInput)) } directive1 := func(ctx context.Context) (interface{}, error) { - role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋgraphqlᚋmodelsᚐRole(ctx, "ADMIN") + role, err := ec.unmarshalNRole2githubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋgraphqlᚋmodelsᚐRole(ctx, "ADMIN") if err != nil { return nil, err } @@ -860,7 +860,7 @@ func (ec *executionContext) _Mutation_updateUser(ctx context.Context, field grap if data, ok := tmp.(*ent.User); ok { return data, nil } - return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/ent.User`, tmp) + return nil, fmt.Errorf(`unexpected type %T from directive, should be *github.com/kcarretto/realm/tavern/internal/ent.User`, tmp) }) if err != nil { ec.Error(ctx, err) @@ -871,7 +871,7 @@ func (ec *executionContext) _Mutation_updateUser(ctx context.Context, field grap } res := resTmp.(*ent.User) fc.Result = res - return ec.marshalOUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋentᚐUser(ctx, field.Selections, res) + return ec.marshalOUser2ᚖgithubᚗcomᚋkcarrettoᚋrealmᚋtavernᚋinternalᚋentᚐUser(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Mutation_updateUser(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { diff --git a/tavern/graphql/generated/prelude.generated.go b/tavern/internal/graphql/generated/prelude.generated.go similarity index 100% rename from tavern/graphql/generated/prelude.generated.go rename to tavern/internal/graphql/generated/prelude.generated.go diff --git a/tavern/graphql/generated/root_.generated.go b/tavern/internal/graphql/generated/root_.generated.go similarity index 99% rename from tavern/graphql/generated/root_.generated.go rename to tavern/internal/graphql/generated/root_.generated.go index 4088290e1..a112ad3e6 100644 --- a/tavern/graphql/generated/root_.generated.go +++ b/tavern/internal/graphql/generated/root_.generated.go @@ -9,8 +9,8 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/introspection" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/graphql/models" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/graphql/models" gqlparser "github.com/vektah/gqlparser/v2" "github.com/vektah/gqlparser/v2/ast" ) @@ -879,7 +879,7 @@ type Beacon implements Node { tasks: [Task!] } """BeaconHostPlatform is enum for the field host_platform""" -enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/ent/beacon.HostPlatform") { +enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/beacon.HostPlatform") { Windows Linux MacOS @@ -1191,7 +1191,7 @@ input FileWhereInput { An object with an ID. Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) """ -interface Node @goModel(model: "github.com/kcarretto/realm/tavern/ent.Noder") { +interface Node @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent.Noder") { """The id of the object.""" id: ID! } @@ -1343,7 +1343,7 @@ type Tag implements Node { beacons: [Beacon!] } """TagKind is enum for the field kind""" -enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/ent/tag.Kind") { +enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/tag.Kind") { group service } diff --git a/tavern/graphql/generated/scalars.generated.go b/tavern/internal/graphql/generated/scalars.generated.go similarity index 100% rename from tavern/graphql/generated/scalars.generated.go rename to tavern/internal/graphql/generated/scalars.generated.go diff --git a/tavern/graphql/gqlgen.yml b/tavern/internal/graphql/gqlgen.yml similarity index 57% rename from tavern/graphql/gqlgen.yml rename to tavern/internal/graphql/gqlgen.yml index b4ba279bf..0c2ba23b4 100644 --- a/tavern/graphql/gqlgen.yml +++ b/tavern/internal/graphql/gqlgen.yml @@ -24,14 +24,14 @@ resolver: # gqlgen will search for any type names in the schema in the generated # ent package. If they match it will use them, otherwise it will new ones. autobind: - - github.com/kcarretto/realm/tavern/ent - - github.com/kcarretto/realm/tavern/ent/file - - github.com/kcarretto/realm/tavern/ent/user - - github.com/kcarretto/realm/tavern/ent/tag - - github.com/kcarretto/realm/tavern/ent/beacon - - github.com/kcarretto/realm/tavern/ent/quest - - github.com/kcarretto/realm/tavern/ent/task - - github.com/kcarretto/realm/tavern/ent/tome + - github.com/kcarretto/realm/tavern/internal/ent + - github.com/kcarretto/realm/tavern/internal/ent/file + - github.com/kcarretto/realm/tavern/internal/ent/user + - github.com/kcarretto/realm/tavern/internal/ent/tag + - github.com/kcarretto/realm/tavern/internal/ent/beacon + - github.com/kcarretto/realm/tavern/internal/ent/quest + - github.com/kcarretto/realm/tavern/internal/ent/task + - github.com/kcarretto/realm/tavern/internal/ent/tome struct_tag: json @@ -42,13 +42,13 @@ models: Node: model: # ent.Noder is the new interface generated by the Node template. - - github.com/kcarretto/realm/tavern/ent.Noder + - github.com/kcarretto/realm/tavern/internal/ent.Noder # - entgo.io/contrib/entgql/internal/todo/ent.Noder # Enums Kind: model: - - github.com/kcarretto/realm/tavern/ent/tag.Kind + - github.com/kcarretto/realm/tavern/internal/ent/tag.Kind HostPlatform: model: - - github.com/kcarretto/realm/tavern/ent/beacon.HostPlatform + - github.com/kcarretto/realm/tavern/internal/ent/beacon.HostPlatform diff --git a/tavern/graphql/graphql_test.go b/tavern/internal/graphql/graphql_test.go similarity index 100% rename from tavern/graphql/graphql_test.go rename to tavern/internal/graphql/graphql_test.go diff --git a/tavern/graphql/models/gqlgen_models.go b/tavern/internal/graphql/models/gqlgen_models.go similarity index 97% rename from tavern/graphql/models/gqlgen_models.go rename to tavern/internal/graphql/models/gqlgen_models.go index b4ae2928a..aa177b029 100644 --- a/tavern/graphql/models/gqlgen_models.go +++ b/tavern/internal/graphql/models/gqlgen_models.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/kcarretto/realm/tavern/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" ) type ClaimTasksInput struct { diff --git a/tavern/graphql/mutation.resolvers.go b/tavern/internal/graphql/mutation.resolvers.go similarity index 95% rename from tavern/graphql/mutation.resolvers.go rename to tavern/internal/graphql/mutation.resolvers.go index dd04e365c..c6a6fb478 100644 --- a/tavern/graphql/mutation.resolvers.go +++ b/tavern/internal/graphql/mutation.resolvers.go @@ -9,13 +9,13 @@ import ( "fmt" "time" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/beacon" - "github.com/kcarretto/realm/tavern/ent/file" - "github.com/kcarretto/realm/tavern/ent/task" - "github.com/kcarretto/realm/tavern/graphql/generated" - "github.com/kcarretto/realm/tavern/graphql/models" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/beacon" + "github.com/kcarretto/realm/tavern/internal/ent/file" + "github.com/kcarretto/realm/tavern/internal/ent/task" + "github.com/kcarretto/realm/tavern/internal/graphql/generated" + "github.com/kcarretto/realm/tavern/internal/graphql/models" ) // CreateQuest is the resolver for the createQuest field. diff --git a/tavern/graphql/query.resolvers.go b/tavern/internal/graphql/query.resolvers.go similarity index 98% rename from tavern/graphql/query.resolvers.go rename to tavern/internal/graphql/query.resolvers.go index 553f621df..ac94c245e 100644 --- a/tavern/graphql/query.resolvers.go +++ b/tavern/internal/graphql/query.resolvers.go @@ -8,7 +8,7 @@ import ( "context" "fmt" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" ) // Files is the resolver for the files field. diff --git a/tavern/graphql/query_test.go b/tavern/internal/graphql/query_test.go similarity index 93% rename from tavern/graphql/query_test.go rename to tavern/internal/graphql/query_test.go index 00358d3ad..ca7d76030 100644 --- a/tavern/graphql/query_test.go +++ b/tavern/internal/graphql/query_test.go @@ -6,10 +6,10 @@ import ( "github.com/99designs/gqlgen/client" "github.com/99designs/gqlgen/graphql/handler" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/graphql/quest_test.go b/tavern/internal/graphql/quest_test.go similarity index 96% rename from tavern/graphql/quest_test.go rename to tavern/internal/graphql/quest_test.go index b0ba83d50..f043fff66 100644 --- a/tavern/graphql/quest_test.go +++ b/tavern/internal/graphql/quest_test.go @@ -11,10 +11,10 @@ import ( "github.com/99designs/gqlgen/client" "github.com/99designs/gqlgen/graphql/handler" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/graphql/resolver.go b/tavern/internal/graphql/resolver.go similarity index 84% rename from tavern/graphql/resolver.go rename to tavern/internal/graphql/resolver.go index 2f24c7add..0fda8da72 100644 --- a/tavern/graphql/resolver.go +++ b/tavern/internal/graphql/resolver.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/graphql/generated" - "github.com/kcarretto/realm/tavern/graphql/models" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/graphql/generated" + "github.com/kcarretto/realm/tavern/internal/graphql/models" "github.com/99designs/gqlgen/graphql" ) diff --git a/tavern/graphql/rollback.go b/tavern/internal/graphql/rollback.go similarity index 78% rename from tavern/graphql/rollback.go rename to tavern/internal/graphql/rollback.go index 41f5bfcd9..7d36c5173 100644 --- a/tavern/graphql/rollback.go +++ b/tavern/internal/graphql/rollback.go @@ -3,7 +3,7 @@ package graphql import ( "fmt" - "github.com/kcarretto/realm/tavern/ent" + "github.com/kcarretto/realm/tavern/internal/ent" ) func rollback(tx *ent.Tx, err error) error { diff --git a/tavern/graphql/schema.graphql b/tavern/internal/graphql/schema.graphql similarity index 99% rename from tavern/graphql/schema.graphql rename to tavern/internal/graphql/schema.graphql index aed90d9d6..c3cec5ff6 100644 --- a/tavern/graphql/schema.graphql +++ b/tavern/internal/graphql/schema.graphql @@ -29,7 +29,7 @@ type Beacon implements Node { tasks: [Task!] } """BeaconHostPlatform is enum for the field host_platform""" -enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/ent/beacon.HostPlatform") { +enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/beacon.HostPlatform") { Windows Linux MacOS @@ -337,6 +337,47 @@ input FileWhereInput { hashEqualFold: String hashContainsFold: String } +""" +An object with an ID. +Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) +""" +interface Node @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent.Noder") { + """The id of the object.""" + id: ID! +} +"""Possible directions in which to order a list of items when provided an `orderBy` argument.""" +enum OrderDirection { + """Specifies an ascending order for a given `orderBy` argument.""" + ASC + """Specifies a descending order for a given `orderBy` argument.""" + DESC +} +""" +Information about pagination in a connection. +https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo +""" +type PageInfo { + """When paginating forwards, are there more items?""" + hasNextPage: Boolean! + """When paginating backwards, are there more items?""" + hasPreviousPage: Boolean! + """When paginating backwards, the cursor to continue.""" + startCursor: Cursor + """When paginating forwards, the cursor to continue.""" + endCursor: Cursor +} +type Query { + """Fetches an object given its ID.""" + node( + """ID of the object.""" + id: ID! + ): Node + """Lookup nodes by a list of IDs.""" + nodes( + """The list of node IDs.""" + ids: [ID!]! + ): [Node]! +} type Quest implements Node { id: ID! """Timestamp of when this ent was created""" @@ -443,47 +484,6 @@ input QuestWhereInput { hasCreator: Boolean hasCreatorWith: [UserWhereInput!] } -""" -An object with an ID. -Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) -""" -interface Node @goModel(model: "github.com/kcarretto/realm/tavern/ent.Noder") { - """The id of the object.""" - id: ID! -} -"""Possible directions in which to order a list of items when provided an `orderBy` argument.""" -enum OrderDirection { - """Specifies an ascending order for a given `orderBy` argument.""" - ASC - """Specifies a descending order for a given `orderBy` argument.""" - DESC -} -""" -Information about pagination in a connection. -https://relay.dev/graphql/connections.htm#sec-undefined.PageInfo -""" -type PageInfo { - """When paginating forwards, are there more items?""" - hasNextPage: Boolean! - """When paginating backwards, are there more items?""" - hasPreviousPage: Boolean! - """When paginating backwards, the cursor to continue.""" - startCursor: Cursor - """When paginating forwards, the cursor to continue.""" - endCursor: Cursor -} -type Query { - """Fetches an object given its ID.""" - node( - """ID of the object.""" - id: ID! - ): Node - """Lookup nodes by a list of IDs.""" - nodes( - """The list of node IDs.""" - ids: [ID!]! - ): [Node]! -} type Tag implements Node { id: ID! """Name of the tag""" @@ -493,7 +493,7 @@ type Tag implements Node { beacons: [Beacon!] } """TagKind is enum for the field kind""" -enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/ent/tag.Kind") { +enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/tag.Kind") { group service } diff --git a/tavern/graphql/schema/directives.graphql b/tavern/internal/graphql/schema/directives.graphql similarity index 100% rename from tavern/graphql/schema/directives.graphql rename to tavern/internal/graphql/schema/directives.graphql diff --git a/tavern/graphql/schema/ent.graphql b/tavern/internal/graphql/schema/ent.graphql similarity index 99% rename from tavern/graphql/schema/ent.graphql rename to tavern/internal/graphql/schema/ent.graphql index 8a2a1a038..548a58b76 100644 --- a/tavern/graphql/schema/ent.graphql +++ b/tavern/internal/graphql/schema/ent.graphql @@ -24,7 +24,7 @@ type Beacon implements Node { tasks: [Task!] } """BeaconHostPlatform is enum for the field host_platform""" -enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/ent/beacon.HostPlatform") { +enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/beacon.HostPlatform") { Windows Linux MacOS @@ -336,7 +336,7 @@ input FileWhereInput { An object with an ID. Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) """ -interface Node @goModel(model: "github.com/kcarretto/realm/tavern/ent.Noder") { +interface Node @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent.Noder") { """The id of the object.""" id: ID! } @@ -488,7 +488,7 @@ type Tag implements Node { beacons: [Beacon!] } """TagKind is enum for the field kind""" -enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/ent/tag.Kind") { +enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/tag.Kind") { group service } diff --git a/tavern/graphql/schema/inputs.graphql b/tavern/internal/graphql/schema/inputs.graphql similarity index 100% rename from tavern/graphql/schema/inputs.graphql rename to tavern/internal/graphql/schema/inputs.graphql diff --git a/tavern/graphql/schema/mutation.graphql b/tavern/internal/graphql/schema/mutation.graphql similarity index 100% rename from tavern/graphql/schema/mutation.graphql rename to tavern/internal/graphql/schema/mutation.graphql diff --git a/tavern/graphql/schema/query.graphql b/tavern/internal/graphql/schema/query.graphql similarity index 100% rename from tavern/graphql/schema/query.graphql rename to tavern/internal/graphql/schema/query.graphql diff --git a/tavern/graphql/schema/scalars.graphql b/tavern/internal/graphql/schema/scalars.graphql similarity index 100% rename from tavern/graphql/schema/scalars.graphql rename to tavern/internal/graphql/schema/scalars.graphql diff --git a/tavern/graphql/tag_test.go b/tavern/internal/graphql/tag_test.go similarity index 93% rename from tavern/graphql/tag_test.go rename to tavern/internal/graphql/tag_test.go index b823c8dfd..dbce7dc0d 100644 --- a/tavern/graphql/tag_test.go +++ b/tavern/internal/graphql/tag_test.go @@ -7,11 +7,11 @@ import ( "github.com/99designs/gqlgen/client" "github.com/99designs/gqlgen/graphql/handler" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/ent/tag" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent/tag" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/graphql/testdata/example.yml b/tavern/internal/graphql/testdata/example.yml similarity index 100% rename from tavern/graphql/testdata/example.yml rename to tavern/internal/graphql/testdata/example.yml diff --git a/tavern/graphql/testdata/mutations/claimTasks/ExistingBeacon.yml b/tavern/internal/graphql/testdata/mutations/claimTasks/ExistingBeacon.yml similarity index 100% rename from tavern/graphql/testdata/mutations/claimTasks/ExistingBeacon.yml rename to tavern/internal/graphql/testdata/mutations/claimTasks/ExistingBeacon.yml diff --git a/tavern/graphql/testdata/mutations/claimTasks/Filters.yml b/tavern/internal/graphql/testdata/mutations/claimTasks/Filters.yml similarity index 100% rename from tavern/graphql/testdata/mutations/claimTasks/Filters.yml rename to tavern/internal/graphql/testdata/mutations/claimTasks/Filters.yml diff --git a/tavern/graphql/testdata/mutations/claimTasks/MultiTask.yml b/tavern/internal/graphql/testdata/mutations/claimTasks/MultiTask.yml similarity index 100% rename from tavern/graphql/testdata/mutations/claimTasks/MultiTask.yml rename to tavern/internal/graphql/testdata/mutations/claimTasks/MultiTask.yml diff --git a/tavern/graphql/testdata/mutations/claimTasks/NewBeacon.yml b/tavern/internal/graphql/testdata/mutations/claimTasks/NewBeacon.yml similarity index 100% rename from tavern/graphql/testdata/mutations/claimTasks/NewBeacon.yml rename to tavern/internal/graphql/testdata/mutations/claimTasks/NewBeacon.yml diff --git a/tavern/graphql/testdata/mutations/claimTasks/OneTask.yml b/tavern/internal/graphql/testdata/mutations/claimTasks/OneTask.yml similarity index 100% rename from tavern/graphql/testdata/mutations/claimTasks/OneTask.yml rename to tavern/internal/graphql/testdata/mutations/claimTasks/OneTask.yml diff --git a/tavern/graphql/testdata/mutations/createQuest/NoFiles.yml b/tavern/internal/graphql/testdata/mutations/createQuest/NoFiles.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createQuest/NoFiles.yml rename to tavern/internal/graphql/testdata/mutations/createQuest/NoFiles.yml diff --git a/tavern/graphql/testdata/mutations/createQuest/WithFiles.yml b/tavern/internal/graphql/testdata/mutations/createQuest/WithFiles.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createQuest/WithFiles.yml rename to tavern/internal/graphql/testdata/mutations/createQuest/WithFiles.yml diff --git a/tavern/graphql/testdata/mutations/createTag/Group.yml b/tavern/internal/graphql/testdata/mutations/createTag/Group.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createTag/Group.yml rename to tavern/internal/graphql/testdata/mutations/createTag/Group.yml diff --git a/tavern/graphql/testdata/mutations/createTag/MultipleBeacons.yml b/tavern/internal/graphql/testdata/mutations/createTag/MultipleBeacons.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createTag/MultipleBeacons.yml rename to tavern/internal/graphql/testdata/mutations/createTag/MultipleBeacons.yml diff --git a/tavern/graphql/testdata/mutations/createTag/Service.yml b/tavern/internal/graphql/testdata/mutations/createTag/Service.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createTag/Service.yml rename to tavern/internal/graphql/testdata/mutations/createTag/Service.yml diff --git a/tavern/graphql/testdata/mutations/createTome/NoFiles.yml b/tavern/internal/graphql/testdata/mutations/createTome/NoFiles.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createTome/NoFiles.yml rename to tavern/internal/graphql/testdata/mutations/createTome/NoFiles.yml diff --git a/tavern/graphql/testdata/mutations/createTome/WithFiles.yml b/tavern/internal/graphql/testdata/mutations/createTome/WithFiles.yml similarity index 100% rename from tavern/graphql/testdata/mutations/createTome/WithFiles.yml rename to tavern/internal/graphql/testdata/mutations/createTome/WithFiles.yml diff --git a/tavern/graphql/testdata/mutations/submitTaskResult/Append.yml b/tavern/internal/graphql/testdata/mutations/submitTaskResult/Append.yml similarity index 100% rename from tavern/graphql/testdata/mutations/submitTaskResult/Append.yml rename to tavern/internal/graphql/testdata/mutations/submitTaskResult/Append.yml diff --git a/tavern/graphql/testdata/mutations/submitTaskResult/OneAndDone.yml b/tavern/internal/graphql/testdata/mutations/submitTaskResult/OneAndDone.yml similarity index 100% rename from tavern/graphql/testdata/mutations/submitTaskResult/OneAndDone.yml rename to tavern/internal/graphql/testdata/mutations/submitTaskResult/OneAndDone.yml diff --git a/tavern/graphql/testdata/mutations/updateBeacon/AddTag.yml b/tavern/internal/graphql/testdata/mutations/updateBeacon/AddTag.yml similarity index 100% rename from tavern/graphql/testdata/mutations/updateBeacon/AddTag.yml rename to tavern/internal/graphql/testdata/mutations/updateBeacon/AddTag.yml diff --git a/tavern/graphql/testdata/mutations/updateBeacon/ChangeHostname.yml b/tavern/internal/graphql/testdata/mutations/updateBeacon/ChangeHostname.yml similarity index 100% rename from tavern/graphql/testdata/mutations/updateBeacon/ChangeHostname.yml rename to tavern/internal/graphql/testdata/mutations/updateBeacon/ChangeHostname.yml diff --git a/tavern/graphql/testdata/mutations/updateBeacon/RemoveTag.yml b/tavern/internal/graphql/testdata/mutations/updateBeacon/RemoveTag.yml similarity index 100% rename from tavern/graphql/testdata/mutations/updateBeacon/RemoveTag.yml rename to tavern/internal/graphql/testdata/mutations/updateBeacon/RemoveTag.yml diff --git a/tavern/graphql/testdata/mutations/updateTag/ChangeName.yml b/tavern/internal/graphql/testdata/mutations/updateTag/ChangeName.yml similarity index 100% rename from tavern/graphql/testdata/mutations/updateTag/ChangeName.yml rename to tavern/internal/graphql/testdata/mutations/updateTag/ChangeName.yml diff --git a/tavern/graphql/testdata/mutations/updateUser/ChangeUsername.yml b/tavern/internal/graphql/testdata/mutations/updateUser/ChangeUsername.yml similarity index 100% rename from tavern/graphql/testdata/mutations/updateUser/ChangeUsername.yml rename to tavern/internal/graphql/testdata/mutations/updateUser/ChangeUsername.yml diff --git a/tavern/graphql/testdata/mutations/updateUser/PermissionDenied.yml b/tavern/internal/graphql/testdata/mutations/updateUser/PermissionDenied.yml similarity index 100% rename from tavern/graphql/testdata/mutations/updateUser/PermissionDenied.yml rename to tavern/internal/graphql/testdata/mutations/updateUser/PermissionDenied.yml diff --git a/tavern/graphql/testdata/queries/beacons/FilterByID.yml b/tavern/internal/graphql/testdata/queries/beacons/FilterByID.yml similarity index 100% rename from tavern/graphql/testdata/queries/beacons/FilterByID.yml rename to tavern/internal/graphql/testdata/queries/beacons/FilterByID.yml diff --git a/tavern/graphql/testdata/queries/beacons/Singular.yml b/tavern/internal/graphql/testdata/queries/beacons/Singular.yml similarity index 100% rename from tavern/graphql/testdata/queries/beacons/Singular.yml rename to tavern/internal/graphql/testdata/queries/beacons/Singular.yml diff --git a/tavern/graphql/testdata/queries/files/FilterByID.yml b/tavern/internal/graphql/testdata/queries/files/FilterByID.yml similarity index 100% rename from tavern/graphql/testdata/queries/files/FilterByID.yml rename to tavern/internal/graphql/testdata/queries/files/FilterByID.yml diff --git a/tavern/graphql/testdata/queries/files/Singular.yml b/tavern/internal/graphql/testdata/queries/files/Singular.yml similarity index 100% rename from tavern/graphql/testdata/queries/files/Singular.yml rename to tavern/internal/graphql/testdata/queries/files/Singular.yml diff --git a/tavern/graphql/testdata/queries/quests/FilterByID.yml b/tavern/internal/graphql/testdata/queries/quests/FilterByID.yml similarity index 100% rename from tavern/graphql/testdata/queries/quests/FilterByID.yml rename to tavern/internal/graphql/testdata/queries/quests/FilterByID.yml diff --git a/tavern/graphql/testdata/queries/quests/Singular.yml b/tavern/internal/graphql/testdata/queries/quests/Singular.yml similarity index 100% rename from tavern/graphql/testdata/queries/quests/Singular.yml rename to tavern/internal/graphql/testdata/queries/quests/Singular.yml diff --git a/tavern/graphql/testdata/queries/tags/FilterByID.yml b/tavern/internal/graphql/testdata/queries/tags/FilterByID.yml similarity index 100% rename from tavern/graphql/testdata/queries/tags/FilterByID.yml rename to tavern/internal/graphql/testdata/queries/tags/FilterByID.yml diff --git a/tavern/graphql/testdata/queries/tags/FilterByKind.yml b/tavern/internal/graphql/testdata/queries/tags/FilterByKind.yml similarity index 100% rename from tavern/graphql/testdata/queries/tags/FilterByKind.yml rename to tavern/internal/graphql/testdata/queries/tags/FilterByKind.yml diff --git a/tavern/graphql/testdata/queries/tags/Singular.yml b/tavern/internal/graphql/testdata/queries/tags/Singular.yml similarity index 100% rename from tavern/graphql/testdata/queries/tags/Singular.yml rename to tavern/internal/graphql/testdata/queries/tags/Singular.yml diff --git a/tavern/graphql/testdata/queries/tomes/FilterByID.yml b/tavern/internal/graphql/testdata/queries/tomes/FilterByID.yml similarity index 100% rename from tavern/graphql/testdata/queries/tomes/FilterByID.yml rename to tavern/internal/graphql/testdata/queries/tomes/FilterByID.yml diff --git a/tavern/graphql/testdata/queries/tomes/Singular.yml b/tavern/internal/graphql/testdata/queries/tomes/Singular.yml similarity index 100% rename from tavern/graphql/testdata/queries/tomes/Singular.yml rename to tavern/internal/graphql/testdata/queries/tomes/Singular.yml diff --git a/tavern/graphql/testdata/queries/users/FilterByID.yml b/tavern/internal/graphql/testdata/queries/users/FilterByID.yml similarity index 100% rename from tavern/graphql/testdata/queries/users/FilterByID.yml rename to tavern/internal/graphql/testdata/queries/users/FilterByID.yml diff --git a/tavern/graphql/testdata/queries/users/Singular.yml b/tavern/internal/graphql/testdata/queries/users/Singular.yml similarity index 100% rename from tavern/graphql/testdata/queries/users/Singular.yml rename to tavern/internal/graphql/testdata/queries/users/Singular.yml diff --git a/tavern/graphql/tome_test.go b/tavern/internal/graphql/tome_test.go similarity index 93% rename from tavern/graphql/tome_test.go rename to tavern/internal/graphql/tome_test.go index 468bb234f..53332f37f 100644 --- a/tavern/graphql/tome_test.go +++ b/tavern/internal/graphql/tome_test.go @@ -6,10 +6,10 @@ import ( "github.com/99designs/gqlgen/client" "github.com/99designs/gqlgen/graphql/handler" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/graphql/user_test.go b/tavern/internal/graphql/user_test.go similarity index 91% rename from tavern/graphql/user_test.go rename to tavern/internal/graphql/user_test.go index 1ea52f5cc..932326a73 100644 --- a/tavern/graphql/user_test.go +++ b/tavern/internal/graphql/user_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - "github.com/kcarretto/realm/tavern/auth" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/graphql" + "github.com/kcarretto/realm/tavern/internal/auth" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/graphql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/tavern/namegen/namegen.go b/tavern/internal/namegen/namegen.go similarity index 100% rename from tavern/namegen/namegen.go rename to tavern/internal/namegen/namegen.go diff --git a/tavern/namegen/namegen_test.go b/tavern/internal/namegen/namegen_test.go similarity index 92% rename from tavern/namegen/namegen_test.go rename to tavern/internal/namegen/namegen_test.go index 87aa02081..b8f3756bd 100644 --- a/tavern/namegen/namegen_test.go +++ b/tavern/internal/namegen/namegen_test.go @@ -3,7 +3,7 @@ package namegen_test import ( "testing" - "github.com/kcarretto/realm/tavern/namegen" + "github.com/kcarretto/realm/tavern/internal/namegen" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/internal/www/generate.go b/tavern/internal/www/generate.go deleted file mode 100644 index 968a9f9d8..000000000 --- a/tavern/internal/www/generate.go +++ /dev/null @@ -1,3 +0,0 @@ -package www - -//go:generate /bin/sh -c "cat ../../graphql/schema/* > schema.graphql" diff --git a/tavern/internal/www/schema.graphql b/tavern/internal/www/schema.graphql index eacec8b4e..c3cec5ff6 100644 --- a/tavern/internal/www/schema.graphql +++ b/tavern/internal/www/schema.graphql @@ -29,7 +29,7 @@ type Beacon implements Node { tasks: [Task!] } """BeaconHostPlatform is enum for the field host_platform""" -enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/ent/beacon.HostPlatform") { +enum BeaconHostPlatform @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/beacon.HostPlatform") { Windows Linux MacOS @@ -341,7 +341,7 @@ input FileWhereInput { An object with an ID. Follows the [Relay Global Object Identification Specification](https://relay.dev/graphql/objectidentification.htm) """ -interface Node @goModel(model: "github.com/kcarretto/realm/tavern/ent.Noder") { +interface Node @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent.Noder") { """The id of the object.""" id: ID! } @@ -493,7 +493,7 @@ type Tag implements Node { beacons: [Beacon!] } """TagKind is enum for the field kind""" -enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/ent/tag.Kind") { +enum TagKind @goModel(model: "github.com/kcarretto/realm/tavern/internal/ent/tag.Kind") { group service } diff --git a/tavern/main.go b/tavern/main.go index a701eedaf..a7352a748 100644 --- a/tavern/main.go +++ b/tavern/main.go @@ -5,7 +5,7 @@ import ( "log" "os" - _ "github.com/kcarretto/realm/tavern/ent/runtime" + _ "github.com/kcarretto/realm/tavern/internal/ent/runtime" _ "github.com/mattn/go-sqlite3" ) diff --git a/tavern/test_data.go b/tavern/test_data.go index 237a4fcac..0a0c82f4d 100644 --- a/tavern/test_data.go +++ b/tavern/test_data.go @@ -9,8 +9,8 @@ import ( "log" "time" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/tag" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/tag" ) // createTestData populates the DB with some test data :) diff --git a/tavern/test_data_test.go b/tavern/test_data_test.go index bfb157bbf..49cd1d8f9 100644 --- a/tavern/test_data_test.go +++ b/tavern/test_data_test.go @@ -5,8 +5,8 @@ import ( "encoding/json" "testing" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent/tome" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tavern/tomes/parse.go b/tavern/tomes/parse.go index 73211fbcd..f9904d759 100644 --- a/tavern/tomes/parse.go +++ b/tavern/tomes/parse.go @@ -6,8 +6,8 @@ import ( "io/fs" "path/filepath" - "github.com/kcarretto/realm/tavern/ent" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent" + "github.com/kcarretto/realm/tavern/internal/ent/tome" "gopkg.in/yaml.v3" ) diff --git a/tavern/tomes/parse_test.go b/tavern/tomes/parse_test.go index db09f4b61..55698e96b 100644 --- a/tavern/tomes/parse_test.go +++ b/tavern/tomes/parse_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/kcarretto/realm/tavern/ent/enttest" - "github.com/kcarretto/realm/tavern/ent/tome" + "github.com/kcarretto/realm/tavern/internal/ent/enttest" + "github.com/kcarretto/realm/tavern/internal/ent/tome" "github.com/kcarretto/realm/tavern/tomes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"