From 9887889ecb939cecd829ea5dfe0d12dbb38811f7 Mon Sep 17 00:00:00 2001
From: Ryan Prather <ryan@rkprather.com>
Date: Tue, 28 Jan 2025 20:59:14 -0500
Subject: [PATCH] ref: Repositories

* Refactor all files
---
 .../{ => Case}/CaseItineraryRepository.php    | 16 +++----
 .../{ => Case}/CaseLocationRepository.php     |  8 ++--
 .../{ => Case}/MemberCaseRepository.php       |  6 +--
 .../{ => Case}/MemberDocumentRepository.php   |  6 +--
 .../{ => Case}/MemberRepository.php           |  6 +--
 .../Case/MonthlyCaseNoteRepository.php        | 43 ++++++++++++++++++
 src/Repository/{ => Case}/NoteRepository.php  |  6 +--
 .../{ => Case}/ReferralRepository.php         | 14 +++---
 .../StandardNoteMemberRepository.php          |  4 +-
 .../{ => Case}/StandardNoteRepository.php     | 42 +++++++++++++++---
 .../{ => Case}/VisitNoteMembersRepository.php |  4 +-
 .../{ => Case}/VisitNoteRepository.php        | 44 ++++++++++++++++---
 .../CompanyDocumentRepository.php             |  4 +-
 .../{ => Company}/CompanyRepository.php       |  4 +-
 .../CommunityResourceRepository.php           |  4 +-
 .../{ => Staff}/StaffNoteRepository.php       |  6 +--
 .../{ => Staff}/SupervisionRepository.php     |  6 +--
 .../{ => System}/LocationRepository.php       | 12 ++---
 .../{ => System}/MessagesRepository.php       |  6 +--
 .../{ => System}/ReferralSourceRepository.php |  4 +-
 .../System/SubscriptionRepository.php         | 43 ++++++++++++++++++
 .../{ => System}/UserCaseRepository.php       |  4 +-
 .../{ => System}/UserRepository.php           |  6 +--
 23 files changed, 222 insertions(+), 76 deletions(-)
 rename src/Repository/{ => Case}/CaseItineraryRepository.php (92%)
 rename src/Repository/{ => Case}/CaseLocationRepository.php (92%)
 rename src/Repository/{ => Case}/MemberCaseRepository.php (93%)
 rename src/Repository/{ => Case}/MemberDocumentRepository.php (94%)
 rename src/Repository/{ => Case}/MemberRepository.php (94%)
 create mode 100644 src/Repository/Case/MonthlyCaseNoteRepository.php
 rename src/Repository/{ => Case}/NoteRepository.php (94%)
 rename src/Repository/{ => Case}/ReferralRepository.php (91%)
 rename src/Repository/{ => Case}/StandardNoteMemberRepository.php (94%)
 rename src/Repository/{ => Case}/StandardNoteRepository.php (70%)
 rename src/Repository/{ => Case}/VisitNoteMembersRepository.php (94%)
 rename src/Repository/{ => Case}/VisitNoteRepository.php (69%)
 rename src/Repository/{ => Company}/CompanyDocumentRepository.php (94%)
 rename src/Repository/{ => Company}/CompanyRepository.php (94%)
 rename src/Repository/{ => Resources}/CommunityResourceRepository.php (93%)
 rename src/Repository/{ => Staff}/StaffNoteRepository.php (94%)
 rename src/Repository/{ => Staff}/SupervisionRepository.php (94%)
 rename src/Repository/{ => System}/LocationRepository.php (91%)
 rename src/Repository/{ => System}/MessagesRepository.php (95%)
 rename src/Repository/{ => System}/ReferralSourceRepository.php (95%)
 create mode 100644 src/Repository/System/SubscriptionRepository.php
 rename src/Repository/{ => System}/UserCaseRepository.php (94%)
 rename src/Repository/{ => System}/UserRepository.php (97%)

diff --git a/src/Repository/CaseItineraryRepository.php b/src/Repository/Case/CaseItineraryRepository.php
similarity index 92%
rename from src/Repository/CaseItineraryRepository.php
rename to src/Repository/Case/CaseItineraryRepository.php
index aaee4e2..0a6f4a6 100644
--- a/src/Repository/CaseItineraryRepository.php
+++ b/src/Repository/Case/CaseItineraryRepository.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\CaseItinerary;
-use App\Entity\MemberCase;
-use App\Entity\User;
-use App\Entity\UserCase;
+use App\Entity\Case\CaseItinerary;
+use App\Entity\Case\MemberCase;;
+use App\Entity\System\User;
+use App\Entity\System\UserCase;
 use DateTime;
 use DateTimeZone;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -42,7 +42,7 @@ class CaseItineraryRepository extends ServiceEntityRepository
         }
 
         $query->orderBy('ci.date', 'DESC')
-            ->addOrderBy('ci.arrival', 'DESC');
+            ->addOrderBy('ci.departure', 'DESC');
 
         //dd($query->getQuery());
 
@@ -60,7 +60,7 @@ class CaseItineraryRepository extends ServiceEntityRepository
             ->andWhere('ci.date >= :from')
             ->setParameter('from', $startDate->format('Y-01-01'))
             ->orderBy('ci.date', 'DESC')
-            ->addOrderBy('ci.arrival', 'DESC')
+            ->addOrderBy('ci.departure', 'DESC')
         ;
 
         return $query->getQuery()->getResult();
@@ -77,7 +77,7 @@ class CaseItineraryRepository extends ServiceEntityRepository
             ->andWhere('ci.date >= :from')
             ->setParameter('from', $startDate->modify('-30 days')->format('Y-m-d'))
             ->orderBy('ci.date', 'DESC')
-            ->addOrderBy('ci.arrival', 'DESC')
+            ->addOrderBy('ci.departure', 'DESC')
         ;
 
         return $query->getQuery()->getResult();
diff --git a/src/Repository/CaseLocationRepository.php b/src/Repository/Case/CaseLocationRepository.php
similarity index 92%
rename from src/Repository/CaseLocationRepository.php
rename to src/Repository/Case/CaseLocationRepository.php
index a964e33..4550630 100644
--- a/src/Repository/CaseLocationRepository.php
+++ b/src/Repository/Case/CaseLocationRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\CaseLocation;
-use App\Entity\Location;
-use App\Entity\MemberCase;
+use App\Entity\Case\CaseLocation;
+use App\Entity\System\Location;
+use App\Entity\Case\MemberCase;;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/MemberCaseRepository.php b/src/Repository/Case/MemberCaseRepository.php
similarity index 93%
rename from src/Repository/MemberCaseRepository.php
rename to src/Repository/Case/MemberCaseRepository.php
index e2d7fcc..b5b087c 100644
--- a/src/Repository/MemberCaseRepository.php
+++ b/src/Repository/Case/MemberCaseRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\Company;
-use App\Entity\MemberCase;
+use App\Entity\Company\Company;
+use App\Entity\Case\MemberCase;;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/MemberDocumentRepository.php b/src/Repository/Case/MemberDocumentRepository.php
similarity index 94%
rename from src/Repository/MemberDocumentRepository.php
rename to src/Repository/Case/MemberDocumentRepository.php
index 6cb916a..1f09d0e 100644
--- a/src/Repository/MemberDocumentRepository.php
+++ b/src/Repository/Case/MemberDocumentRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\MemberDocument;
-use App\Entity\Member;
+use App\Entity\Case\MemberDocument;
+use App\Entity\Case\Member;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/MemberRepository.php b/src/Repository/Case/MemberRepository.php
similarity index 94%
rename from src/Repository/MemberRepository.php
rename to src/Repository/Case/MemberRepository.php
index 453269a..e73e8f2 100644
--- a/src/Repository/MemberRepository.php
+++ b/src/Repository/Case/MemberRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\Member;
-use App\Entity\MemberCase;
+use App\Entity\Case\Member;
+use App\Entity\Case\MemberCase;;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/Case/MonthlyCaseNoteRepository.php b/src/Repository/Case/MonthlyCaseNoteRepository.php
new file mode 100644
index 0000000..b4290eb
--- /dev/null
+++ b/src/Repository/Case/MonthlyCaseNoteRepository.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Repository\Case;
+
+use App\Entity\Case\MonthlyCaseNote;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<MonthlyCaseNote>
+ */
+class MonthlyCaseNoteRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, MonthlyCaseNote::class);
+    }
+
+    //    /**
+    //     * @return MonthlyCaseNote[] Returns an array of MonthlyCaseNote objects
+    //     */
+    //    public function findByExampleField($value): array
+    //    {
+    //        return $this->createQueryBuilder('m')
+    //            ->andWhere('m.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->orderBy('m.id', 'ASC')
+    //            ->setMaxResults(10)
+    //            ->getQuery()
+    //            ->getResult()
+    //        ;
+    //    }
+
+    //    public function findOneBySomeField($value): ?MonthlyCaseNote
+    //    {
+    //        return $this->createQueryBuilder('m')
+    //            ->andWhere('m.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->getQuery()
+    //            ->getOneOrNullResult()
+    //        ;
+    //    }
+}
diff --git a/src/Repository/NoteRepository.php b/src/Repository/Case/NoteRepository.php
similarity index 94%
rename from src/Repository/NoteRepository.php
rename to src/Repository/Case/NoteRepository.php
index 4dbced3..b4cd4ae 100644
--- a/src/Repository/NoteRepository.php
+++ b/src/Repository/Case/NoteRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\Note;
-use App\Entity\Referral;
+use App\Entity\Case\Note;
+use App\Entity\Case\Referral;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/ReferralRepository.php b/src/Repository/Case/ReferralRepository.php
similarity index 91%
rename from src/Repository/ReferralRepository.php
rename to src/Repository/Case/ReferralRepository.php
index 136a02e..a029a0f 100644
--- a/src/Repository/ReferralRepository.php
+++ b/src/Repository/Case/ReferralRepository.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\MemberCase;
-use App\Entity\Referral;
-use App\Enums\ReferralServiceType;
+use App\Entity\Case\MemberCase;;
+use App\Entity\Case\Referral;
+use App\Enums\Case\ReferralServiceType;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Persistence\ManagerRegistry;
@@ -57,10 +57,10 @@ class ReferralRepository extends ServiceEntityRepository
 
     public function populateNotes(Referral &$referral): void
     {
-        $noteType = 'App\Entity\StandardNote';
+        $noteType = 'App\Entity\Case\StandardNote';
 
         if ($referral->getServiceCode() == ReferralServiceType::VS_THBB) {
-            $noteType = 'App\Entity\VisitNote';
+            $noteType = 'App\Entity\Case\VisitNote';
         }
 
         $query = $this->getEntityManager()->createQuery("
@@ -74,8 +74,6 @@ class ReferralRepository extends ServiceEntityRepository
         if (!count($res)){
             return;
         }
-
-        $referral->setNotes(new ArrayCollection($res));
     }
 
     //    /**
diff --git a/src/Repository/StandardNoteMemberRepository.php b/src/Repository/Case/StandardNoteMemberRepository.php
similarity index 94%
rename from src/Repository/StandardNoteMemberRepository.php
rename to src/Repository/Case/StandardNoteMemberRepository.php
index d33a34b..eb0e7a2 100644
--- a/src/Repository/StandardNoteMemberRepository.php
+++ b/src/Repository/Case/StandardNoteMemberRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\StandardNoteMember;
+use App\Entity\Case\StandardNoteMember;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/StandardNoteRepository.php b/src/Repository/Case/StandardNoteRepository.php
similarity index 70%
rename from src/Repository/StandardNoteRepository.php
rename to src/Repository/Case/StandardNoteRepository.php
index c630e87..777bdae 100644
--- a/src/Repository/StandardNoteRepository.php
+++ b/src/Repository/Case/StandardNoteRepository.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\Referral;
-use App\Entity\StandardNote;
-use App\Entity\User;
-use App\Entity\UserCase;
+use App\Entity\Case\Referral;
+use App\Entity\Case\StandardNote;
+use App\Entity\System\User;
+use App\Entity\System\UserCase;
+use App\Enums\Case\ReferralType;
+use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -69,6 +71,36 @@ class StandardNoteRepository extends ServiceEntityRepository
         ;
     }
 
+    /** 
+     * Method to return the total time billed
+     * 
+     * @param User $user
+     * @param DateTime $startDate
+     * 
+     * @return int
+     *      Total minutes rounded to the nearest 15 min increment
+     */
+    public function getTotalBillableHours(User $user, DateTime $startDate, ReferralType $referralType = null): array
+    {
+        $res = $this->createQueryBuilder('s')
+            ->leftJoin(Referral::class, 'r', 'WITH', 'r.id = s.referral')
+            ->leftJoin(UserCase::class, 'uc', 'WITH', 'uc.memberCase = r.memberCase')
+            ->where('uc.user = :user')
+            ->andWhere('s.date >= :startDate')
+            ->setParameter('user', $user->getId()->toBinary())
+            ->setParameter('startDate', $startDate->format('Y-m-d'))
+        ;
+
+        if (null !== $referralType) {
+            $res->andWhere('r.serviceCode = :referralType')
+                ->setParameter('referralType', $referralType);
+        }
+
+        $ret = $res->getQuery()->getResult();
+
+        return $ret;
+    }
+
     //    /**
     //     * @return StandardNote[] Returns an array of StandardNote objects
     //     */
diff --git a/src/Repository/VisitNoteMembersRepository.php b/src/Repository/Case/VisitNoteMembersRepository.php
similarity index 94%
rename from src/Repository/VisitNoteMembersRepository.php
rename to src/Repository/Case/VisitNoteMembersRepository.php
index 4dd452d..ba7a378 100644
--- a/src/Repository/VisitNoteMembersRepository.php
+++ b/src/Repository/Case/VisitNoteMembersRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\VisitNoteMembers;
+use App\Entity\Case\VisitNoteMembers;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/VisitNoteRepository.php b/src/Repository/Case/VisitNoteRepository.php
similarity index 69%
rename from src/Repository/VisitNoteRepository.php
rename to src/Repository/Case/VisitNoteRepository.php
index b5c2a75..9a7b32f 100644
--- a/src/Repository/VisitNoteRepository.php
+++ b/src/Repository/Case/VisitNoteRepository.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Case;
 
-use App\Entity\Referral;
-use App\Entity\UserCase;
-use App\Entity\User;
-use App\Entity\VisitNote;
-use App\Entity\VisitNoteMembers;
-use DateTimeImmutable;
+use App\Entity\Case\Referral;
+use App\Entity\System\UserCase;
+use App\Entity\System\User;
+use App\Entity\Case\VisitNote;
+use App\Enums\Case\ReferralType;
+use DateTime;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -69,6 +69,36 @@ class VisitNoteRepository extends ServiceEntityRepository
         ;
     }
 
+        /** 
+     * Method to return the total time billed
+     * 
+     * @param User $user
+     * @param DateTime $startDate
+     * 
+     * @return int
+     *      Total minutes rounded to the nearest 15 min increment
+     */
+    public function getTotalBillableHours(User $user, DateTime $startDate, ReferralType $referralType = null): array
+    {
+        $res = $this->createQueryBuilder('v')
+            ->leftJoin(Referral::class, 'r', 'WITH', 'r.id = v.referral')
+            ->leftJoin(UserCase::class, 'uc', 'WITH', 'uc.memberCase = r.memberCase')
+            ->where('uc.user = :user')
+            ->andWhere('v.date >= :startDate')
+            ->setParameter('user', $user->getId()->toBinary())
+            ->setParameter('startDate', $startDate->format('Y-m-d'))
+        ;
+
+        if (null !== $referralType) {
+            $res->andWhere('r.serviceCode = :referralType')
+                ->setParameter('referralType', $referralType);
+        }
+
+        $ret = $res->getQuery()->getResult();
+        
+        return $ret;
+    }
+
     //    /**
     //     * @return VisitNote[] Returns an array of VisitNote objects
     //     */
diff --git a/src/Repository/CompanyDocumentRepository.php b/src/Repository/Company/CompanyDocumentRepository.php
similarity index 94%
rename from src/Repository/CompanyDocumentRepository.php
rename to src/Repository/Company/CompanyDocumentRepository.php
index 7c6359a..98cb430 100644
--- a/src/Repository/CompanyDocumentRepository.php
+++ b/src/Repository/Company/CompanyDocumentRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Company;
 
-use App\Entity\CompanyDocument;
+use App\Entity\Company\CompanyDocument;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/CompanyRepository.php b/src/Repository/Company/CompanyRepository.php
similarity index 94%
rename from src/Repository/CompanyRepository.php
rename to src/Repository/Company/CompanyRepository.php
index c0140b5..332d4df 100644
--- a/src/Repository/CompanyRepository.php
+++ b/src/Repository/Company/CompanyRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Company;
 
-use App\Entity\Company;
+use App\Entity\Company\Company;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/CommunityResourceRepository.php b/src/Repository/Resources/CommunityResourceRepository.php
similarity index 93%
rename from src/Repository/CommunityResourceRepository.php
rename to src/Repository/Resources/CommunityResourceRepository.php
index 9b083a2..6bdc084 100644
--- a/src/Repository/CommunityResourceRepository.php
+++ b/src/Repository/Resources/CommunityResourceRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Resources;
 
-use App\Entity\CommunityResource;
+use App\Entity\Resources\CommunityResource;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/StaffNoteRepository.php b/src/Repository/Staff/StaffNoteRepository.php
similarity index 94%
rename from src/Repository/StaffNoteRepository.php
rename to src/Repository/Staff/StaffNoteRepository.php
index a2052ab..e4c2f12 100644
--- a/src/Repository/StaffNoteRepository.php
+++ b/src/Repository/Staff/StaffNoteRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Staff;
 
-use App\Entity\MemberCase;
-use App\Entity\StaffNote;
+use App\Entity\Case\MemberCase;;
+use App\Entity\Staff\StaffNote;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/SupervisionRepository.php b/src/Repository/Staff/SupervisionRepository.php
similarity index 94%
rename from src/Repository/SupervisionRepository.php
rename to src/Repository/Staff/SupervisionRepository.php
index 0aef6e8..a864c00 100644
--- a/src/Repository/SupervisionRepository.php
+++ b/src/Repository/Staff/SupervisionRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\Staff;
 
-use App\Entity\Supervision;
-use App\Entity\User;
+use App\Entity\Staff\Supervision;
+use App\Entity\System\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/LocationRepository.php b/src/Repository/System/LocationRepository.php
similarity index 91%
rename from src/Repository/LocationRepository.php
rename to src/Repository/System/LocationRepository.php
index d960771..37699a1 100644
--- a/src/Repository/LocationRepository.php
+++ b/src/Repository/System/LocationRepository.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\System;
 
-use App\Entity\CaseLocation;
-use App\Entity\Location;
-use App\Entity\MemberCase;
-use App\Entity\User;
-use App\Entity\UserCase;
+use App\Entity\Case\CaseLocation;
+use App\Entity\System\Location;
+use App\Entity\Case\MemberCase;;
+use App\Entity\System\User;
+use App\Entity\System\UserCase;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/MessagesRepository.php b/src/Repository/System/MessagesRepository.php
similarity index 95%
rename from src/Repository/MessagesRepository.php
rename to src/Repository/System/MessagesRepository.php
index 9928f1c..b5980ef 100644
--- a/src/Repository/MessagesRepository.php
+++ b/src/Repository/System/MessagesRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\System;
 
-use App\Entity\Messages;
-use App\Entity\User;
+use App\Entity\System\Messages;
+use App\Entity\System\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/ReferralSourceRepository.php b/src/Repository/System/ReferralSourceRepository.php
similarity index 95%
rename from src/Repository/ReferralSourceRepository.php
rename to src/Repository/System/ReferralSourceRepository.php
index b309571..dac297d 100644
--- a/src/Repository/ReferralSourceRepository.php
+++ b/src/Repository/System/ReferralSourceRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\System;
 
-use App\Entity\ReferralSource;
+use App\Entity\System\ReferralSource;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/System/SubscriptionRepository.php b/src/Repository/System/SubscriptionRepository.php
new file mode 100644
index 0000000..e876be3
--- /dev/null
+++ b/src/Repository/System/SubscriptionRepository.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Repository\System;
+
+use App\Entity\System\Subscription;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<Subscription>
+ */
+class SubscriptionRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Subscription::class);
+    }
+
+    //    /**
+    //     * @return Subscription[] Returns an array of Subscription objects
+    //     */
+    //    public function findByExampleField($value): array
+    //    {
+    //        return $this->createQueryBuilder('s')
+    //            ->andWhere('s.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->orderBy('s.id', 'ASC')
+    //            ->setMaxResults(10)
+    //            ->getQuery()
+    //            ->getResult()
+    //        ;
+    //    }
+
+    //    public function findOneBySomeField($value): ?Subscription
+    //    {
+    //        return $this->createQueryBuilder('s')
+    //            ->andWhere('s.exampleField = :val')
+    //            ->setParameter('val', $value)
+    //            ->getQuery()
+    //            ->getOneOrNullResult()
+    //        ;
+    //    }
+}
diff --git a/src/Repository/UserCaseRepository.php b/src/Repository/System/UserCaseRepository.php
similarity index 94%
rename from src/Repository/UserCaseRepository.php
rename to src/Repository/System/UserCaseRepository.php
index c45bc52..ccd7af1 100644
--- a/src/Repository/UserCaseRepository.php
+++ b/src/Repository/System/UserCaseRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\System;
 
-use App\Entity\UserCase;
+use App\Entity\System\UserCase;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Repository/UserRepository.php b/src/Repository/System/UserRepository.php
similarity index 97%
rename from src/Repository/UserRepository.php
rename to src/Repository/System/UserRepository.php
index 8ff5e8c..05c2f7c 100644
--- a/src/Repository/UserRepository.php
+++ b/src/Repository/System/UserRepository.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Repository;
+namespace App\Repository\System;
 
-use App\Entity\Company;
-use App\Entity\User;
+use App\Entity\Company\Company;
+use App\Entity\System\User;
 use DateTime;
 use DateTimeZone;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;