app/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "app",
-  "version": "1.1.1",
+  "version": "1.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "app",
-      "version": "1.1.1",
+      "version": "1.1.0",
       "dependencies": {
         "@capacitor/android": "6.1.2",
         "@capacitor/app": "6.0.1",

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app",
   "private": true,
-  "version": "1.1.1",
+  "version": "1.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

app/src/App.vue

@@ -95,7 +95,7 @@ const logoutUser = () => {
               <ion-icon slot="icon-only" :icon="chevronBack"></ion-icon>
             </ion-button>
           </ion-buttons>
-          <ion-title>User Menu</ion-title>
+          <ion-title>Menu Content</ion-title>
         </ion-toolbar>
       </ion-header>
       <ion-content>

app/src/services/BullpenSessionService.ts

@@ -30,7 +30,7 @@ export class BullpenSessionService extends ApiService<Bullpen> {
         }
     }
 
-    public fetchAllByUser(id: number, page: number, size: number): Promise<Pageable<Bullpen>> {
+    public findByPitcherId(id: number, page: number, size: number): Promise<Pageable<Bullpen>> {
         return api
             .get('/bullpen_session', { params: {
                 user: id,

app/src/services/PlayerService.ts

@@ -15,20 +15,20 @@ class PlayerService extends ApiService<Player> {
             gender: 'male',
             bats: 'right',
             throws: 'right',
-            height: 0,
+            height: 187,
-            weight: 0,
+            weight: 84,
             state: 'active',
-            jerseyNumber: 0,
+            jerseyNumber: 23,
             createdAt: new Date(),
             updatedAt: new Date(),
             user: {
                 id: 0,
                 auth: {
-                    email: '',
+                    email: 'test@de.de',
-                    password: ''
+                    password: 'test$123'
                 },
-                firstName: '',
+                firstName: 'Demo',
-                lastName: '',
+                lastName: 'Player',
                 dateOfBirth: new Date(),
                 roles: ['player'],
                 createdAt: new Date(),

app/src/views/HomeView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {computed, ref, reactive} from 'vue';
+import {computed, ref} from 'vue';
 import {
   IonPage,
   IonHeader,
@@ -7,33 +7,24 @@ import {
   IonTitle,
   IonContent,
   IonAvatar,
+  IonButton,
   IonButtons,
   IonIcon,
   IonMenuButton,
   IonFab,
-  IonFabButton,
+  IonFabButton
-  IonInfiniteScroll,
-  IonInfiniteScrollContent,
-  InfiniteScrollCustomEvent,
-  IonList,
-  IonItem,
-  IonLabel, IonBadge,
 } from '@ionic/vue';
 import {
   playOutline,
   statsChartOutline,
   personOutline,
-  baseball,
   add,
-  personAddOutline, baseballOutline
+  personAddOutline
 } from 'ionicons/icons';
 import {useStore} from "vuex";
 import {useRouter} from "vue-router";
 import BullpenSessionService from "@/services/BullpenSessionService";
 import TokenService from "@/services/TokenService";
-import dayjs from "dayjs";
-import Bullpen from "@/types/Bullpen";
-import PitchType from "@/types/PitchType";
 
 const router = useRouter();
 const store = useStore();
@@ -69,39 +60,6 @@ const addPlayer = () => {
   router.push({ path: '/player/create' });
 }
 
-const items = reactive<Bullpen[]>([]);
-const page = ref(0);
-
-const generateItems = () => {
-  BullpenSessionService
-      .fetchAllByUser(user.value.id, page.value, 10)
-      .then((bullpens) => {
-        ++page.value;
-        bullpens.data.forEach((bullpen: Bullpen) => {
-          items.push(bullpen);
-        })
-      }, error => {
-        console.log(error);
-      });
-};
-
-const formatDate = (date: Date) => {
-  return dayjs(date).format('YYYY.MM.DD HH:mm');
-}
-
-// const determinePitchTypeName = (id: number): string => {
-//   const pitchType = store.state.pitchTypes.find((pitchType: PitchType) => pitchType.id === id);
-//
-//   return pitchType?.name ?? 'Unknown';
-// }
-
-const ionInfinite = (event: InfiniteScrollCustomEvent) => {
-  generateItems();
-  setTimeout(() => event.target.complete(), 500);
-};
-
-generateItems();
-
 </script>
 
 <template>
@@ -117,24 +75,7 @@ generateItems();
       </ion-toolbar>
     </ion-header>
 
-    <ion-content>
+    <ion-content class="ion-padding">
-      <ion-list>
-        <ion-item v-for="(bullpen, index) in items" :key="index">
-          <ion-icon aria-hidden="true" :icon="baseball" slot="start"></ion-icon>
-          <ion-label>Bullpen from ({{formatDate(bullpen.startedAt)}})</ion-label>
-<!--          <ion-list v-for="(pitch, index) in bullpen.pitches" :key="index">-->
-<!--            <ion-item>-->
-<!--              <ion-icon slot="start" :icon="baseballOutline" class="icon-login"></ion-icon>-->
-<!--              <ion-label>{{determinePitchTypeName(pitch.pitchTypeId)}}</ion-label>-->
-<!--              <ion-badge>{{pitch.aimedArea}}</ion-badge>-->
-<!--              <ion-badge>{{pitch.hitArea}}</ion-badge>-->
-<!--            </ion-item>-->
-<!--          </ion-list>-->
-        </ion-item>
-      </ion-list>
-      <ion-infinite-scroll @ionInfinite="ionInfinite">
-        <ion-infinite-scroll-content></ion-infinite-scroll-content>
-      </ion-infinite-scroll>
 <!--      <div class="user-container">-->
 <!--        <ion-avatar class="user-avatar">-->
 <!--          <template v-if="userImage">-->

backend/docker-compose.dev.yml

@@ -1,12 +1,37 @@
 services:
-  postgres:
+  db:
-    image: postgres:14-alpine
+    image: postgres:15
-    container_name: postgres14
+    restart: unless-stopped
-    ports:
+    env_file: ./.env.development
-      - "5432:5432"
-    volumes:
-      - ~/apps/postgres:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: postgres
+      POSTGRES_DB: $DB_NAME
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: $DB_USER
-      POSTGRES_DB: bullpen-dev
+      POSTGRES_PASSWORD: $DB_PASSWORD
+    ports:
+      - $DB_PORT:$DB_PORT
+    volumes:
+      - db_data:/var/lib/postgresql/data
+
+  app-dev:
+    image: node:20-alpine
+    restart: unless-stopped
+    env_file: ./.env.development
+    working_dir: /app
+    volumes:
+      - .:/app
+      - /app/node_modules
+    ports:
+      - '$NODE_LOCAL_PORT:$NODE_DOCKER_PORT'
+    environment:
+      NODE_ENV: development
+      DB_HOST: db
+      DB_PORT: $DB_PORT
+      DB_NAME: $DB_NAME
+      DB_USER: $DB_USER
+      DB_PASS: $DB_PASSWORD
+    command: sh -c "npm install && npm run dev"
+    depends_on:
+      - db
+
+volumes:
+  db_data:

backend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bullpen-backend",
-  "version": "1.1.1",
+  "version": "1.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bullpen-backend",
-      "version": "1.1.1",
+      "version": "1.1.0",
       "license": "ISC",
       "dependencies": {
         "bcryptjs": "^3.0.2",

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bullpen-backend",
-  "version": "1.1.1",
+  "version": "1.1.0",
   "main": "server.js",
   "scripts": {
     "prebuild": "node -p \"'const BULLPEN_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\"\n\nmodule.exports = BULLPEN_VERSION; > config/version.js",
@@ -15,9 +15,6 @@
     "start:prod": "npm run cross-env NODE_ENV=production node server.js",
     "start:dev": "cross-env NODE_ENV=development nodemon server.js",
     "migrate:dev": "cross-env NODE_ENV=development npx sequelize-cli db:migrate",
-    "seed:bullpen": "cross-env NODE_ENV=development npx sequelize-cli db:seed --seed 05-bullpens.js",
-    "dev:db:start": "docker-compose -f docker-compose.dev.yml up -d",
-    "dev:db:stop": "docker-compose -f docker-compose.dev.yml down -v",
     "test:db:start": "docker-compose -f docker-compose.test.yml up -d",
     "test:db:stop": "docker-compose -f docker-compose.test.yml down -v",
     "test:run": "dotenv -e .env.test -- jest --runInBand --detectOpenHandles",

backend/readme.md

@@ -16,8 +16,5 @@ docker-compose up --build -d
 docker-compose exec app npx sequelize-cli db:migrate
 docker-compose exec app npx sequelize-cli db:seed:all
 
-// seed one specific file
-docker-compose exec app npx sequelize db:seed --seed my_seeder_file.js
-
 docker-compose exec app sh
 ```

backend/seeders/05-bullpens.js

@@ -1,69 +1,48 @@
 const process = require('process');
 const {createPlayer, createUsers} = require("../helper/seeder.helper");
 
-
+const createBullpen = async (queryInterface, demoPlayer) => {
-const pickRandomValueFromArray = (values) => {
-    return values[Math.floor(Math.random() * values.length)];
-}
-
-const shouldMatch = (percentage) => {
-    return Math.random() * 100 < percentage;
-}
-
-const createBullpens = async (queryInterface, demoPlayer) => {
     const startDate = new Date();
-    // const endDate = new Date(new Date().setTime(startDate.getTime() + (10 * 60000)));
+    const endDate = new Date(new Date().setTime(startDate.getTime() + 10 * 60000));
-    // create 20 bullpens for demo player
     const bullpens = [...Array(20).keys()].map(key => {
-        const days = 5 + key;
-        const startedAt = new Date(new Date().setDate(startDate.getDate() - days));
         return {
-            pitcherId: demoPlayer.userId,
+            pitcherId: demoPlayer.user.id,
-            startedAt: startedAt,
+            startedAt: new Date(new Date().setDate(startDate.getDate()-5)),
-            finishedAt: new Date(new Date().setTime(startedAt.getTime() + (10 * 60000))),
+            finishedAt: new Date(new Date().setDate(startDate.getDate()-5)),
             createdAt: new Date(),
             updatedAt: new Date()
         }
     })
     await queryInterface.bulkInsert('BullpenSessions', bullpens);
 
-    const pitchTypeIds = (await queryInterface
+    const pitchTypeIds = await queryInterface
-        .select(null, 'PitchTypes'))
+        .select(null, 'PitchTypes')
         .map(pitchType => pitchType.id);
 
     // red: 21-28
     // orange: 11-18:
     // green: 1-9
     const bullpenChart = [
-        1,2,3,4,5,6,7,8,9,
+        [21,22,23,24,25,26,27,28],
-        11,12,13,14,15,16,17,18,
+        [11,12,13,14,15,16,17,18],
-        21,22,23,24,25,26,27,28
+        [1,2,3,4,5,6,7,8,9]
-    ];
+    ]
 
     const dbBullpens = await queryInterface.select(null, 'BullpenSessions', {
         where: {
-            pitcherId: demoPlayer.userId
+            pitcherId: demoPlayer.user.id
         }
     });
 
-    // fill pitches for each bullpen
+    [...Array(20).keys()].map(key => {
-    const pitches = dbBullpens.map(bullpen => {
-        return [...Array(20).keys()].map(key => {
-            const aimedArea = pickRandomValueFromArray(bullpenChart);
-            const hitArea = shouldMatch(30) ? aimedArea : pickRandomValueFromArray(bullpenChart);
         return {
-                pitchTypeId: pickRandomValueFromArray(pitchTypeIds),
+            pitchTypeId: pitchTypeIds[Math.floor(Math.random() * pitchTypeIds.length)],
-                bullpenSessionId: bullpen.id,
+            pitchTime: new Date(2025, 3, 22, 16, 7, 21),
-                pitchTime: new Date(new Date().setTime(bullpen.startedAt.getTime() + key * 60000)),
+            aimedArea: 11,
-                aimedArea: aimedArea,
+            hitArea: 12
-                hitArea: hitArea,
+        }
-                createdAt: new Date(),
-                updatedAt: new Date()
-            };
-        });
-    });
 
-    await queryInterface.bulkInsert('Pitches', pitches.flat());
+    });
 }
 
 /** @type {import('sequelize-cli').Migration} */
@@ -71,14 +50,6 @@ module.exports = {
     async up (queryInterface, /*Sequelize*/) {
         if (process.env.NODE_ENV !== 'development') return;
 
-        let demoPlayer = (await queryInterface.select(null, 'Players', {
-            where: {
-                height: 187,
-                weight: 85,
-            }
-        })).shift();
-
-        if (demoPlayer === undefined) {
         const roles = await queryInterface.select(null, 'Roles');
         const players = [{
             email: 'demo@bullpen.com',
@@ -95,19 +66,18 @@ module.exports = {
             state: 'active'
         }];
 
-            await createPlayer(queryInterface, roles, players);
+        const dbPlayers = await createPlayer(queryInterface, roles, players);
-            demoPlayer = (await queryInterface.select(null, 'Players', {
+        const demoPlayer = dbPlayers
-                where: {
+            .filter(player => player.user.auth.email === 'demo@bullpen.com').shift();
-                    height: 187,
-                    weight: 85,
-                }
-            })).shift();
-        }
 
-        await createBullpens(queryInterface, demoPlayer);
+        for (let i = 0; i < 10; ++i) {
+            createBullpen(queryInterface, demoPlayer);
+        }
     },
 
-    async down (/*queryInterface,*/ /*Sequelize*/) {
+    async down (queryInterface, /*Sequelize*/) {
-        // if (process.env.NODE_ENV !== 'development') return;
+        if (process.env.NODE_ENV !== 'development') return;
+
+        return;
     }
 };