Refactor

Author: iamvigneshwars

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 {
-    "name": "graph-data-processing",
+    "name": "processed_data",
     "dockerComposeFile": "docker-compose.yml",
-    "service": "graph-data-processing",
+    "service": "processed_data",
     "customizations": {
       "vscode": {
         "extensions": [

.devcontainer/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 
 services:
-  graph-data-processing:
+  processed_data:
     build:
       context: .
       dockerfile: Dockerfile
@@ -11,3 +11,9 @@ services:
     environment:
       DATABASE_URL: mysql://root:rootpassword@ispyb/ispyb_build
       LOG_LEVEL: DEBUG
+
+  ispyb:
+    image: ghcr.io/diamondlightsource/ispyb-database:v3.0.0
+    restart: unless-stopped
+    environment:
+      MARIADB_ROOT_PASSWORD: rootpassword

.github/workflows/schema.yml

@@ -39,13 +39,13 @@ jobs:
           command: run
           args: >
             schema
-            --path graph-data-processing.graphql
+            --path processed_data.graphql
 
       - name: Upload Schema Artifact
         uses: actions/upload-artifact@v4.3.1
         with:
-          name: graph-data-processing.graphql
-          path: graph-data-processing.graphql
+          name: processed_data.graphql
+          path: processed_data.graphql
 
   publish:
       # Deduplicate jobs from pull requests and branch pushes within the same repo.
@@ -62,22 +62,22 @@ jobs:
         - name: Download Schema Artifact
           uses: actions/download-artifact@v4.1.4
           with:
-            name: graph-data-processing.graphql
+            name: processed_data.graphql
 
         - name: Check Subgraph Schema
           run: >
             rover subgraph check data-gateway-n63jcf@current
-            --schema graph-data-processing.graphql
-            --name graph-data-processing
+            --schema processed_data.graphql
+            --name processed_data
           env:
             APOLLO_KEY: ${{ secrets.APOLLO_STUDIO }}
 
         - name: Publish Subgraph Schema to Apollo Studio
           if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }}
           run: >
             rover subgraph publish data-gateway-n63jcf@current 
-            --routing-url http://graph-data-processing:80 
-            --schema graph-data-processing.graphql
-            --name graph-data-processing
+            --routing-url http://processed_data:80 
+            --schema processed_data.graphql
+            --name processed_data
           env:
             APOLLO_KEY: ${{ secrets.APOLLO_STUDIO }} 

.vscode/settings.json

@@ -30,7 +30,7 @@
         }
     ],
     "rust-analyzer.linkedProjects": [
-        "./graph-data-processing/Cargo.toml"
+        "./processed_data/Cargo.toml"
     ],
     "rust-analyzer.showUnlinkedFileNotification": false
 }

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
-default-members = ["graph-data-processing"]
-members = ["models", "graph-data-processing"]
+default-members = ["processed_data"]
+members = ["models", "processed_data"]
 resolver = "2"
 
 [workspace.dependencies]

Cargo.toml

@@ -6,22 +6,22 @@ WORKDIR /app
 
 COPY Cargo.toml Cargo.lock .
 COPY models/Cargo.toml models/Cargo.toml
-COPY graph-data-processing/Cargo.toml graph-data-processing/Cargo.toml
+COPY processed_data/Cargo.toml processed_data/Cargo.toml
 
 RUN mkdir models/src \
     && touch models/src/lib.rs \
-    && mkdir graph-data-processing/src \
-    && echo "fn main() {}" > graph-data-processing/src/main.rs \
+    && mkdir processed_data/src \
+    && echo "fn main() {}" > processed_data/src/main.rs \
     && cargo build --release
 
 COPY . /app
 
 RUN touch models/src/lib.rs \
-    && touch graph-data-processing/src/main.rs \
+    && touch processed_data/src/main.rs \
     && cargo build --release
 
 FROM gcr.io/distroless/cc AS deploy
 
-COPY --from=build /app/target/release/graph-data-processing /graph-data-processing
+COPY --from=build /app/target/release/processed_data /processed_data
 
-ENTRYPOINT ["/graph-data-processing"]
+ENTRYPOINT ["/processed_data"]