fix(GAT-1234): test-for-memory-leaks-rto

.env.example

@@ -105,7 +105,7 @@ ORCID_CLIENT_SECRET=""
 IDVT_ORG_SCANNER="http://soursd-ocr:8000/grab"
 IDVT_COMPANIES_HOUSE_URL="https://find-and-update.company-information.service.gov.uk/company/"
 
-OCTANE_SERVER=frankenphp
+OCTANE_SERVER=swoole
 OCTANE_HTTPS=false
 
 RATE_LIMIT=10000

.github/workflows/dev_deployment.yaml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - dev # override for branch deployment
+      - 'bugfix/test-for-memory-leaks-rto'
 
 env:
   PROJECT_ID: '${{ secrets.PROJECT_ID }}'
@@ -26,7 +27,7 @@ jobs:
         id: checkout
         uses: actions/checkout@v4
         with:
-          ref: dev  # override for branch deployment
+          ref: bugfix/test-for-memory-leaks-rto  # override for branch deployment
 
       - name: Read VERSION file
         id: getversion
@@ -76,7 +77,7 @@ jobs:
         id: checkout
         uses: actions/checkout@v4
         with:
-          ref: dev  # override for branch deployment
+          ref: bugfix/test-for-memory-leaks-rto  # override for branch deployment
 
       - name: Google Auth
         id: auth

.gitignore

@@ -28,3 +28,5 @@ clean.sh
 clean.shrr
 frankenphp
 _ide_helper_models.php
+
+frankenphp-worker.php

Dockerfile

@@ -1,13 +1,16 @@
+# Use PHP 8.3.3 FPM as base image
 FROM php:8.3.3-fpm
 
+# Set environment variables
 ENV COMPOSER_PROCESS_TIMEOUT=600
 ENV REBUILD_DB=1
 
+# Set working directory
 WORKDIR /var/www
 
-COPY composer.* /var/www/
-
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
+    curl \
     nodejs \
     npm \
     libfreetype6-dev \
@@ -19,55 +22,106 @@ RUN apt-get update && apt-get install -y \
     wget \
     zlib1g-dev \
     zip \
+    unzip \
+    git \
     default-mysql-client \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install -j$(nproc) gd pdo pdo_mysql soap zip iconv bcmath \
+    supervisor \
+    procps \
+    psmisc \
+    apt-transport-https \
+    gnupg \
+    lsb-release \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Configure and install PHP extensions
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
-    && docker-php-ext-install sockets \
-    && docker-php-ext-install exif \
     && docker-php-ext-configure pcntl --enable-pcntl \
-    && docker-php-ext-install pcntl
+    && docker-php-ext-install -j$(nproc) \
+        gd \
+        pdo \
+        pdo_mysql \
+        soap \
+        zip \
+        iconv \
+        bcmath \
+        sockets \
+        exif \
+        pcntl
 
+# Create SSL certificate symlink
 RUN mkdir -p /etc/pki/tls/certs && \
     ln -s /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt
 
-# Install Redis and Imagick
+# Install Redis extension
 RUN wget -O redis-5.3.7.tgz 'https://pecl.php.net/get/redis-5.3.7.tgz' \
     && pecl install redis-5.3.7.tgz \
     && rm -rf redis-5.3.7.tgz \
     && rm -rf /tmp/pear \
     && docker-php-ext-enable redis
 
+# Install FrankenPHP extension
+RUN curl https://frankenphp.dev/install.sh | sh \
+    && mv frankenphp /usr/local/bin/frankenphp \
+    && chmod +x /usr/local/bin/frankenphp 
+
 # Install Composer
 RUN curl -sS https://getcomposer.org/installer | php -- \
     --install-dir=/usr/local/bin --filename=composer
 
-# Send update for php.ini
+# Copy composer files first for better caching
+COPY composer.* /var/www/
+
+# Copy PHP configuration
 COPY ./init/php.development.ini /usr/local/etc/php/php.ini
 
 # Copy the application
 COPY . /var/www
 
-RUN curl https://frankenphp.dev/install.sh | sh \
-    && mv frankenphp /usr/local/bin/frankenphp \
-    && chmod +x /usr/local/bin/frankenphp
-
 # Composer & laravel
-RUN composer install \
-    && php artisan octane:install \
+RUN composer install --optimize-autoloader \
+    && npm install --save-dev chokidar \
+    # && php artisan octane:install \
     && php artisan storage:link \
     && php artisan optimize:clear \
     && php artisan optimize \
     && php artisan config:clear \
+    && php artisan octane:install --server=frankenphp \
     && chmod -R 777 storage bootstrap/cache \
     && chown -R www-data:www-data storage \
     && composer dumpautoload
 
-# Generate Swagger
+# Generate Swagger documentation
 RUN php artisan l5-swagger:generate
 
-# Starts both, laravel server and job queue
-CMD ["/var/www/docker/start.sh"]
+# Create supervisor directories and log files
+RUN mkdir -p /var/log/supervisor /var/run/supervisor \
+    && touch /var/log/supervisor/supervisord.log \
+    && touch /var/log/supervisor/octane.log \
+    && touch /var/log/supervisor/horizon.log
+
+# Copy Supervisor configuration
+RUN groupadd -r supervisor || true
+RUN usermod -a -G supervisor www-data || true
+COPY ./docker/supervisord.conf /etc/supervisor/supervisord.conf
+
+COPY ./docker/Caddyfile /var/www/docker/Caddyfile
+
+COPY ./docker/resource-monitor.sh /var/www/docker/resource-monitor.sh
+RUN chmod +x /var/www/docker/resource-monitor.sh \
+    && chown www-data:www-data /var/www/docker/resource-monitor.sh
+
+COPY ./docker/run-scheduler.sh /var/www/docker/run-scheduler.sh
+RUN chmod +x /var/www/docker/run-scheduler.sh \
+    && chown www-data:www-data /var/www/docker/run-scheduler.sh
+
+# Set proper permissions for www-data user
+RUN chown -R www-data:www-data /var/www \
+    && chmod -R 755 /var/www
 
 # Expose port
-EXPOSE 8100
+EXPOSE 8100
+
+# Start supervisord
+CMD ["sh", "-c", "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf"]

app/Console/Kernel.php

@@ -14,9 +14,10 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')->hourly();
-        $schedule->call(function () {
-            UpdateActionNotifications::dispatch();
-        })->everyMinute();
+        // $schedule->call(function () {
+        //     UpdateActionNotifications::dispatch();
+        // })->everyMinute();
+        // $schedule->job(new UpdateActionNotifications)->everyMinute();
 
     }
 

app/Http/Controllers/Api/V1/AffiliationController.php

@@ -79,6 +79,96 @@ public function indexByRegistryId(Request $request, int $registryId): JsonRespon
         ], 200);
     }
 
+    /**
+     * @OA\Get(
+     *      path="/api/v1/affiliations/{registryId}/organisation/{organisationId}",
+     *      operationId="getOrganisationAffiliation",
+     *      summary="Return a specific organisation's affiliation by registry ID and organisation ID",
+     *      description="Get a specific organisation's affiliation for a given registry",
+     *      tags={"Affiliations"},
+     *      security={{"bearerAuth":{}}},
+     *      @OA\Parameter(
+     *          name="registryId",
+     *          in="path",
+     *          required=true,
+     *          description="Registry ID",
+     *          example=1,
+     *          @OA\Schema(type="integer")
+     *      ),
+     *      @OA\Parameter(
+     *          name="organisationId",
+     *          in="path",
+     *          required=true,
+     *          description="Organisation ID",
+     *          example=100,
+     *          @OA\Schema(type="integer")
+     *      ),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Success",
+     *          @OA\JsonContent(
+     *              @OA\Property(property="message", type="string", example="success"),
+     *              @OA\Property(property="data", type="object",
+     *                  @OA\Property(property="id", type="integer", example=123),
+     *                  @OA\Property(property="registry_id", type="integer", example=1),
+     *                  @OA\Property(property="organisation_id", type="integer", example=100),
+     *                  @OA\Property(property="model_state_id", type="integer", example=2),
+     *                  @OA\Property(property="model_state", type="object",
+     *                      @OA\Property(property="id", type="integer", example=2),
+     *                      @OA\Property(property="state_id", type="integer", example=5),
+     *                      @OA\Property(property="state", type="object",
+     *                          @OA\Property(property="id", type="integer", example=5),
+     *                          @OA\Property(property="name", type="string", example="Approved")
+     *                      )
+     *                  ),
+     *                  @OA\Property(property="organisation", type="object",
+     *                      @OA\Property(property="id", type="integer", example=100),
+     *                      @OA\Property(property="organisation_name", type="string", example="Example Org"),
+     *                      @OA\Property(property="unclaimed", type="boolean", example=false),
+     *                      @OA\Property(property="lead_applicant_email", type="string", example="lead@example.org")
+     *                  )
+     *              )
+     *          )
+     *      ),
+     *      @OA\Response(
+     *          response=404,
+     *          description="Affiliation not found",
+     *          @OA\JsonContent(
+     *              @OA\Property(property="message", type="string", example="Affiliation not found")
+     *          )
+     *      )
+     * )
+     */
+    public function getOrganisationAffiliation(Request $request, int $registryId, int $organisationId): JsonResponse
+    {
+        $affiliation = Affiliation::with(
+            [
+                'modelState.state',
+                'organisation' => function ($query) {
+                    $query->select(
+                        'id',
+                        'organisation_name',
+                        'unclaimed',
+                        'lead_applicant_email'
+                    );
+                },
+            ]
+        )
+            ->where(
+                [
+                    'registry_id' => $registryId,
+                    'organisation_id' => $organisationId
+                ]
+            )
+            ->first();
+
+
+        return response()->json([
+            'message' => 'success',
+            'data' => $affiliation,
+        ], 200);
+    }
+
     /**
      * @OA\Post(
      *      path="/api/v1/affiliations/{registryId}",
@@ -328,4 +418,16 @@ public function updateRegistryAffiliation(Request $request, int $registryId, int
             return $this->ErrorResponse($e->getMessage());
         }
     }
+
+    public function getWorkflowStates(Request $request)
+    {
+        $model = new Affiliation();
+        return $this->OKResponse($model->getAllStates());
+    }
+
+    public function getWorkflowTransitions(Request $request)
+    {
+        $model = new Affiliation();
+        return $this->OKResponse($model->getTransitions());
+    }
 }