fix: update AWS_BUCKET name and correct periodo name retrieval in PeriodoService

Back/backendP-Educativa/.env

@@ -41,7 +41,7 @@ MAIL_FROM_NAME="${APP_NAME}"
 AWS_ACCESS_KEY_ID=4fcaae6da39a40198d8b4a27dc893a1a
 AWS_SECRET_ACCESS_KEY=aaaba8656aa91876038d77c362149689fb063e7c761ea47e
 AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=pledu-dv-aeci
+AWS_BUCKET=pledu-dv-fjcm
 AWS_USE_PATH_STYLE_ENDPOINT=true
 AWS_ENDPOINT=https://s3.us-south.cloud-object-storage.appdomain.cloud
 AWS_USE_PATH_STYLE_ENDPOINT=true

Back/backendP-Educativa/app/Http/Controllers/Api/CircularesController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
+use App\Services\PeriodoService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
@@ -12,6 +13,18 @@ use Illuminate\Support\Facades\Validator;
 class CircularesController extends Controller
 {
 
+    protected $nombrePeriodoActivo;
+
+
+    public function __construct(PeriodoService $periodoService)
+    {
+        try {
+            $this->nombrePeriodoActivo = $periodoService->obtenerPeriodoActivoNombre();
+        } catch (\Exception $e) {
+            $this->nombrePeriodoActivo = null;
+        }
+    }
+
     public function findOne($id)
     {
         $id = base64_decode($id);
@@ -272,7 +285,12 @@ class CircularesController extends Controller
 
     public function crear(Request $request)
     {
+        $carpetaBase = config('custom.s3_carpeta_base');
         try {
+
+            $periodoService = new PeriodoService();
+            $carpetaPeriodo = $periodoService->obtenerPeriodoActivoNombre();
+
             $rutaBucket = 'circulares/';
             $archivosAdjuntos = [];
 
@@ -302,7 +320,7 @@ class CircularesController extends Controller
 
                     // Generar nombre del archivo
                     $fileName = $file['id'] . '-' . $file['nombre'] . '.' . $fileExtension;
-                    $pathS3 = $rutaBucket . $fileName;
+                    $pathS3 = $carpetaBase. '/' . $carpetaPeriodo . '/' .$rutaBucket . $fileName;
 
                     // Esto sube al s3
                     Storage::disk('s3')->put($pathS3, $contenidoArchivo, 'public');
@@ -372,7 +390,7 @@ class CircularesController extends Controller
                             $fileExtension = 'pptx';
                             break;
                     }
-                    
+
                     // Generar nombre
                     $fileName = $file['id'] . '-' . $file['nombre'] . '.' . $fileExtension;
                     $pathS3 = $rutaBucket . $fileName;

Back/backendP-Educativa/app/Http/Controllers/PersonalizarController.php

@@ -26,6 +26,8 @@ class PersonalizarController extends Controller
         $this->nombrePeriodoActivo = null;
     }
 }
+
+
 public function show()
 {
     $personalizar = Personalizar::find(1);

Back/backendP-Educativa/app/Services/PeriodoService.php

@@ -14,7 +14,7 @@ class PeriodoService
             ->where('estatus', 'activo')
             ->first();
 
-        return $periodo ? $periodo->nombrePeriodo : null;
+        return $periodo ? $periodo->idPeriodo : null;
     }
 }