Change module name to be intuitive

src/graphql/discussion.rs → src/api/discussion.rs

@@ -7,8 +7,9 @@ use async_graphql::{
 };
 
 use crate::{
+    api,
     database::{self, Database, DiscussionDbSchema, TryFromKeyValue},
-    github::discussions::ReactionContent,
+    outbound::discussions::ReactionContent,
 };
 
 scalar!(ReactionContent);
@@ -53,7 +54,7 @@ impl DiscussionQuery {
             first,
             last,
             |after, before, first, last| async move {
-                super::load_connection(ctx, Database::discussions, after, before, first, last)
+                api::load_connection(ctx, Database::discussions, after, before, first, last)
             },
         )
         .await
@@ -79,14 +80,14 @@ impl fmt::Display for Discussion {
 #[cfg(test)]
 mod tests {
     use crate::{
+        api::TestSchema,
         database::{
             discussion::{
                 Answer, Category, Comment, Comments, Labels, Reaction, Reactions, Replies, Reply,
             },
             DiscussionDbSchema,
         },
-        github::discussions::ReactionContent,
-        graphql::TestSchema,
+        outbound::discussions::ReactionContent,
     };
 
     #[tokio::test]

src/graphql/issue.rs → src/api/issue.rs

@@ -8,12 +8,13 @@ use async_graphql::{
 use serde::{Deserialize, Serialize};
 
 use crate::{
+    api,
+    api::DateTimeUtc,
     database::{self, Database, TryFromKeyValue},
-    github::{
+    outbound::{
         issues::{IssueState, PullRequestState},
         GitHubIssue,
     },
-    graphql::DateTimeUtc,
 };
 
 scalar!(IssueState);
@@ -231,7 +232,7 @@ impl IssueQuery {
             first,
             last,
             |after, before, first, last| async move {
-                super::load_connection(ctx, Database::issues, after, before, first, last)
+                api::load_connection(ctx, Database::issues, after, before, first, last)
             },
         )
         .await
@@ -240,7 +241,7 @@ impl IssueQuery {
 
 #[cfg(test)]
 mod tests {
-    use crate::{github::GitHubIssue, graphql::TestSchema};
+    use crate::{api::TestSchema, outbound::GitHubIssue};
 
     fn create_issues(n: usize) -> Vec<GitHubIssue> {
         (1..=n)

src/graphql/issue_stat.rs → src/api/issue_stat.rs

@@ -1,9 +1,9 @@
 use async_graphql::{Context, InputObject, Object, Result, SimpleObject};
 
 use crate::{
+    api::{issue::Issue, DateTimeUtc},
     database::Iter,
-    github::issues::IssueState,
-    graphql::{issue::Issue, DateTimeUtc},
+    outbound::issues::IssueState,
     Database,
 };
 
@@ -80,7 +80,7 @@ impl IssueStatQuery {
 mod tests {
     use jiff::Timestamp;
 
-    use crate::{github::GitHubIssue, graphql::TestSchema};
+    use crate::{api::TestSchema, outbound::GitHubIssue};
 
     fn create_issues(n: usize) -> Vec<GitHubIssue> {
         (0..n)

src/graphql/pull_request.rs → src/api/pull_request.rs

@@ -6,7 +6,10 @@ use async_graphql::{
     Context, Object, Result, SimpleObject,
 };
 
-use crate::database::{self, Database, TryFromKeyValue};
+use crate::{
+    api,
+    database::{self, Database, TryFromKeyValue},
+};
 
 #[derive(SimpleObject)]
 pub(crate) struct PullRequest {
@@ -61,7 +64,7 @@ impl PullRequestQuery {
             first,
             last,
             |after, before, first, last| async move {
-                super::load_connection(ctx, Database::pull_requests, after, before, first, last)
+                api::load_connection(ctx, Database::pull_requests, after, before, first, last)
             },
         )
         .await
@@ -70,7 +73,7 @@ impl PullRequestQuery {
 
 #[cfg(test)]
 mod tests {
-    use crate::{github::GitHubPullRequests, graphql::TestSchema};
+    use crate::{api::TestSchema, outbound::GitHubPullRequests};
 
     #[tokio::test]
     async fn pull_requests_empty() {

src/database.rs

@@ -10,8 +10,8 @@ pub mod discussion;
 pub(crate) use discussion::DiscussionDbSchema;
 
 use crate::{
-    github::{GitHubIssue, GitHubPullRequests},
-    graphql::{issue::Issue, pull_request::PullRequest},
+    api::{issue::Issue, pull_request::PullRequest},
+    outbound::{GitHubIssue, GitHubPullRequests},
 };
 
 const ISSUE_TREE_NAME: &str = "issues";

src/database/discussion.rs

@@ -4,7 +4,8 @@ use anyhow::Result;
 use serde::{Deserialize, Serialize};
 
 use super::{Database, Iter};
-use crate::github::discussions::{
+use crate::api::Discussion;
+use crate::outbound::discussions::{
     DiscussionsRepositoryDiscussionsNodes, DiscussionsRepositoryDiscussionsNodesAnswer,
     DiscussionsRepositoryDiscussionsNodesAnswerAuthor,
     DiscussionsRepositoryDiscussionsNodesAnswerReplies,
@@ -18,7 +19,6 @@ use crate::github::discussions::{
     DiscussionsRepositoryDiscussionsNodesLabels, DiscussionsRepositoryDiscussionsNodesReactions,
     ReactionContent,
 };
-use crate::graphql::Discussion;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct DiscussionDbSchema {

src/main.rs

@@ -1,8 +1,8 @@
+mod api;
 mod checkout;
 mod database;
-mod github;
 mod google;
-mod graphql;
+mod outbound;
 mod settings;
 mod web;
 
@@ -39,7 +39,7 @@ async fn main() -> Result<()> {
 
     // Fetches issues and pull requests from GitHub every hour, and stores them
     // in the database.
-    task::spawn(github::fetch_periodically(
+    task::spawn(outbound::fetch_periodically(
         Arc::clone(&repositories),
         settings.certification.token,
         time::Duration::from_secs(ONE_HOUR),
@@ -53,7 +53,7 @@ async fn main() -> Result<()> {
         settings.certification.ssh,
     ));
 
-    let schema = graphql::schema(database);
+    let schema = api::schema(database);
 
     web::serve(schema, settings.web.address, &args.key, &args.cert).await;
     Ok(())

src/github.rs → src/outbound.rs

@@ -10,7 +10,7 @@ use tracing::error;
 
 use crate::{
     database::Database,
-    github::{
+    outbound::{
         issues::{
             IssueState, IssuesRepositoryIssuesNodesAuthor::User as IssueAuthor,
             IssuesRepositoryIssuesNodesClosedByPullRequestsReferencesEdgesNodeAuthor::User as PullRequestRefAuthor,
@@ -41,23 +41,23 @@ type URI = String;
 
 #[derive(GraphQLQuery)]
 #[graphql(
-    schema_path = "src/github/schema.graphql",
-    query_path = "src/github/issues.graphql",
+    schema_path = "src/outbound/graphql/schema.graphql",
+    query_path = "src/outbound/graphql/issues.graphql",
     response_derives = "Debug, Clone"
 )]
 pub(crate) struct Issues;
 
 #[derive(GraphQLQuery)]
 #[graphql(
-    schema_path = "src/github/schema.graphql",
-    query_path = "src/github/pull_requests.graphql"
+    schema_path = "src/outbound/graphql/schema.graphql",
+    query_path = "src/outbound/graphql/pull_requests.graphql"
 )]
 struct PullRequests;
 
 #[derive(GraphQLQuery)]
 #[graphql(
-    schema_path = "src/github/schema.graphql",
-    query_path = "src/github/discussions.graphql",
+    schema_path = "src/outbound/graphql/schema.graphql",
+    query_path = "src/outbound/graphql/discussions.graphql",
     response_derives = "Debug"
 )]
 pub(crate) struct Discussions;

src/web.rs

@@ -3,7 +3,7 @@ use std::{convert::Infallible, net::SocketAddr, path::Path};
 use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
 use warp::{http::Response as HttpResponse, Filter};
 
-use crate::graphql::Schema;
+use crate::api::Schema;
 
 pub(super) async fn serve(schema: Schema, socketaddr: SocketAddr, key: &Path, cert: &Path) {
     let filter = async_graphql_warp::graphql(schema).and_then(