Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.0-rc12 #393

Merged
merged 168 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
a09eebc
Add all Interaction types
Orrison Dec 14, 2023
ad38587
Start on query
Orrison Dec 14, 2023
ec3d77a
Ignore ide helpers
Orrison Dec 14, 2023
adfd76d
Setup searching
Orrison Dec 14, 2023
b351469
wip
mxm1070 Dec 14, 2023
19b998b
Merge branch 'develop' into feature/advising-1141-add-api-capabilitie…
mxm1070 Dec 14, 2023
965fc6d
Fix issues
Orrison Dec 14, 2023
e3667c2
wip
mxm1070 Dec 14, 2023
6b65a66
Merge branch 'develop' into feature/advising-1141-add-api-capabilitie…
mxm1070 Dec 14, 2023
a5f3997
Write the queries
Orrison Dec 14, 2023
20c5508
More work on interaction
Orrison Dec 14, 2023
26f5879
more work
Orrison Dec 14, 2023
587dcfe
Merge branch 'develop' into feature/ADVISING-1147-interactions-api
Orrison Dec 14, 2023
f0cb54a
updates
Orrison Dec 14, 2023
0a3cbd6
Define update mutation
Orrison Dec 15, 2023
e8ccd50
Create survey module.
dgoetzit Dec 15, 2023
e482885
Add embed case.
dgoetzit Dec 15, 2023
8cfec1d
Merge branch 'develop' into feature/ADVISING-979-surveys
dgoetzit Dec 15, 2023
45c62a0
Fix API issues
Orrison Dec 15, 2023
c767f57
[ADVISING-1105]: Introduce Spatie GDPR Cookie Package
danharrin Dec 15, 2023
1411bbb
chore: fix enforcement of copyright on all files
danharrin Dec 15, 2023
29004fb
Merge pull request #368 from canyongbs/advising-1105
Orrison Dec 15, 2023
0347bad
Update lock.
dgoetzit Dec 15, 2023
c826b0d
Create survey widget.
dgoetzit Dec 15, 2023
2c397ae
Additions
Orrison Dec 15, 2023
6fe41e5
Remove fields and add todo.
dgoetzit Dec 15, 2023
2cd0694
update ide helpers.
dgoetzit Dec 15, 2023
a2a3d1a
Merge branch 'develop' into feature/ADVISING-979-surveys
dgoetzit Dec 15, 2023
2e16e13
update lock.
dgoetzit Dec 15, 2023
d0d393a
Add recaptcha support
dgoetzit Dec 15, 2023
f7940f5
Add factories
dgoetzit Dec 15, 2023
8afddd1
Fix namespace.
dgoetzit Dec 15, 2023
96cf5a4
chore: fix enforcement of copyright on all files
dgoetzit Dec 15, 2023
4778978
Use searchBy for InteractionStatus
Orrison Dec 15, 2023
a2f66ba
chore: fix code style
joelicatajr Dec 15, 2023
5547813
Add service request management to students.
dgoetzit Dec 15, 2023
ce78d66
GraphQL API for Alerts.
mxm1070 Dec 15, 2023
d6ddf4d
Setup interaction query
Orrison Dec 15, 2023
e03cb7d
Some more input details
Orrison Dec 15, 2023
6db4901
Navigation changes.
mxm1070 Dec 15, 2023
43d8e94
chore: fix enforcement of copyright on all files
mxm1070 Dec 15, 2023
10d76b4
Finish InteractionCampaign
Orrison Dec 15, 2023
7d6f476
Finish all interaction meta models
Orrison Dec 15, 2023
14e8340
Merge branch 'develop' into feature/ADVISING-1147-interactions-api
Orrison Dec 15, 2023
81a3648
composer update
Orrison Dec 15, 2023
e40c6f6
chore: fix enforcement of copyright on all files
Orrison Dec 15, 2023
ee6f470
chore: fix code style
joelicatajr Dec 15, 2023
05bec00
PR feedback and fixes
Orrison Dec 18, 2023
ad60211
Merge pull request #373 from canyongbs/feature/ADVISING-1147-interact…
Orrison Dec 18, 2023
4311289
[ADVISING-1103]: Introduce Portal Settings
danharrin Dec 15, 2023
298e307
chore: fix enforcement of copyright on all files
danharrin Dec 15, 2023
add0c64
update composer lock
Orrison Dec 18, 2023
8f36a0e
Merge pull request #372 from canyongbs/feature/advising-1151-update-s…
Orrison Dec 18, 2023
13b24f7
Merge pull request #370 from canyongbs/advising-1103
Orrison Dec 18, 2023
a184f16
Merge branch 'develop' into feature/advising-1141-add-api-capabilitie…
mxm1070 Dec 18, 2023
8cd5c7b
Merge pull request #371 from canyongbs/feature/advising-1141-add-api-…
Orrison Dec 18, 2023
86c52a3
Add service requests to prospects.
dgoetzit Dec 18, 2023
fdc35b0
Add edit action for service requests.
dgoetzit Dec 18, 2023
2dd6133
Label changes. Prospect observer.
mxm1070 Dec 18, 2023
62875c1
Fix tests.
mxm1070 Dec 18, 2023
85c64c1
chore: fix enforcement of copyright on all files
mxm1070 Dec 18, 2023
5a9bc9d
Merge branch 'develop' into feature/ADVISING-979-surveys
dgoetzit Dec 19, 2023
ca744e7
Update lock.
dgoetzit Dec 19, 2023
9bd9f0c
Re-use formkit from form widget.
dgoetzit Dec 19, 2023
f28c338
Merge pull request #374 from canyongbs/feature/ADVISING-1139-service-…
Orrison Dec 19, 2023
57e2a0e
Merge branch 'develop' into fix/advapp-30-kb-create-error
dgoetzit Dec 19, 2023
bad44f6
Fix file reference.
dgoetzit Dec 19, 2023
e3700aa
Check if createdBy is already set.
mxm1070 Dec 19, 2023
00abd32
Refactor knowledge base to work with tiptap json.
dgoetzit Dec 19, 2023
1b3bdb1
Setup custom ID scalars and use them where appropriate
Orrison Dec 19, 2023
e11b245
chore: fix enforcement of copyright on all files
Orrison Dec 19, 2023
ad07c17
Merge pull request #369 from canyongbs/feature/ADVISING-979-surveys
Orrison Dec 19, 2023
fe9f050
Merge pull request #375 from canyongbs/feature/advapp-94-95-96-97-99-…
Orrison Dec 19, 2023
c6cfbe5
Bump Laravel version constraint
laravel-shift Dec 19, 2023
b9f2b5d
composer update
laravel-shift Dec 19, 2023
fc3660f
Update the composer lock
Orrison Dec 19, 2023
edf25c4
Merge pull request #376 from canyongbs/shift-ci-v10.38.0
Orrison Dec 19, 2023
0286c42
Merge pull request #377 from canyongbs/feature/ADVAPP-19-uuid-scalar
Orrison Dec 19, 2023
4cc36e4
wip
mxm1070 Dec 19, 2023
8214809
Clean up encoder.
dgoetzit Dec 20, 2023
6234c16
Merge branch 'develop' into fix/advapp-30-kb-create-error
dgoetzit Dec 20, 2023
5383fa0
Fix stan issue.
dgoetzit Dec 20, 2023
cd08e80
Fix failing test.
dgoetzit Dec 20, 2023
049882b
Fix footer display on mobile for custom pages.
dgoetzit Dec 20, 2023
f49ba92
Merge pull request #379 from canyongbs/fix/advapp-98-footer-display
Orrison Dec 20, 2023
ebc190a
Merge branch 'develop' into feature/advapp-25-26-21-graphql-cleanup
mxm1070 Dec 20, 2023
b65c7b4
wip
mxm1070 Dec 20, 2023
f02feaa
[ADVAPP-90], [ADVAPP-91], [ADVAPP-92] & [ADVAPP-93]
danharrin Dec 20, 2023
a048a5c
wip
mxm1070 Dec 20, 2023
e764b62
wip
mxm1070 Dec 20, 2023
9041a7f
Cleanup.
mxm1070 Dec 20, 2023
b48eb2f
chore: fix enforcement of copyright on all files
mxm1070 Dec 20, 2023
03b0747
[ADVAPP-11]: Campaign Action Blocks execute_at minDate doesn't work
danharrin Dec 20, 2023
3c4769f
Namespaces.
mxm1070 Dec 20, 2023
79e5482
Format.
mxm1070 Dec 20, 2023
12ecd6e
Format.
mxm1070 Dec 20, 2023
01c18f5
Merge branch 'develop' into feature/advapp-25-26-21-graphql-cleanup
mxm1070 Dec 20, 2023
108a763
Change the php version to be 8.2 specifically
Orrison Dec 20, 2023
c4f73c7
Initial pass on unifying notifications.
dgoetzit Dec 20, 2023
7c3aeae
Merge pull request #380 from canyongbs/advapp-90
Orrison Dec 20, 2023
9c9a03c
Merge pull request #383 from canyongbs/feature/php-version-lock
Orrison Dec 20, 2023
2c4c685
Feedback.
mxm1070 Dec 20, 2023
3dc0e42
Format.
mxm1070 Dec 20, 2023
7890a52
Merge branch 'develop' into feature/advapp-25-26-21-graphql-cleanup
mxm1070 Dec 20, 2023
20636f0
Update all redis keys to use hash slots
Orrison Dec 20, 2023
88db6f0
Make sure to get all keys
Orrison Dec 20, 2023
5ab523c
Clean up result set, implement better type safety.
dgoetzit Dec 20, 2023
c415bf2
Implement base notification for form request sms.
dgoetzit Dec 20, 2023
b825973
Update to add scheme
Orrison Dec 20, 2023
a08c669
Change cache to cluster
Orrison Dec 21, 2023
8e00484
Uncluster
Orrison Dec 21, 2023
66b2ca4
Add email channel.
dgoetzit Dec 21, 2023
3096124
Change base mail message.
dgoetzit Dec 21, 2023
c2dfba7
Fix lint issues.
dgoetzit Dec 21, 2023
57a16f9
ide helpers.
dgoetzit Dec 21, 2023
846fdc9
Fix stan issue.
dgoetzit Dec 21, 2023
9536b57
Extract post sending logic.
dgoetzit Dec 21, 2023
27e941f
Add metadata to message for use in headers.
dgoetzit Dec 21, 2023
8b80f17
Remove directory method from custom TipTap
dgoetzit Dec 21, 2023
4a7ea3d
Add listener for adding message tags metadata headers.
dgoetzit Dec 21, 2023
6177a5b
Merge pull request #378 from canyongbs/fix/advapp-30-kb-create-error
Orrison Dec 21, 2023
b3f3069
Merge pull request #384 from canyongbs/feature/ADVAPP-17-redis
Orrison Dec 21, 2023
4cf9c72
[ADVAPP-11]: Campaign Action Blocks execute_at minDate doesn't work
danharrin Dec 21, 2023
9567a1a
update deps
danharrin Dec 21, 2023
0f82a3e
add all operations
danharrin Dec 21, 2023
bb959cc
revert
danharrin Dec 21, 2023
e3e9a06
Merge branch 'develop' into advapp-11
danharrin Dec 21, 2023
59c4bf6
Feedback.
mxm1070 Dec 21, 2023
442a3e0
Merge branch 'develop' into feature/advapp-25-26-21-graphql-cleanup
mxm1070 Dec 21, 2023
cd70dbb
update deps
danharrin Dec 21, 2023
123b0b2
Fix MyTasks widget status color.
mxm1070 Dec 21, 2023
b71df21
[ADVAPP-110]: Form submission request query issue
danharrin Dec 21, 2023
998e098
Remove missed old api file.
mxm1070 Dec 21, 2023
a1d1339
add fields to model
danharrin Dec 21, 2023
5bf075d
start status
danharrin Dec 21, 2023
1243676
Merge branch 'feature/advapp-25-26-21-graphql-cleanup' into advapp-20
danharrin Dec 21, 2023
c3f72fb
capitalise
danharrin Dec 21, 2023
834253d
Add support for database notifications.
dgoetzit Dec 21, 2023
71fcabb
Add logic post database send.
dgoetzit Dec 21, 2023
0194d94
Merge branch 'develop' into feature/advapp-18-unify-notifications
dgoetzit Dec 21, 2023
39685a8
Update lock.
dgoetzit Dec 21, 2023
d82c8c4
Ensure metadata is set.
dgoetzit Dec 21, 2023
bca6aa4
chore: fix enforcement of copyright on all files
dgoetzit Dec 21, 2023
33ac098
Update to include a specific SQS connection
Orrison Dec 21, 2023
ac0b1fe
finish prospects
danharrin Dec 21, 2023
4877dd4
Merge pull request #385 from canyongbs/advapp-11
Orrison Dec 21, 2023
98cde6a
Merge pull request #386 from canyongbs/advapp-110
Orrison Dec 21, 2023
0bd28a0
Add test, import class.
dgoetzit Dec 21, 2023
5cdc799
Merge pull request #382 from canyongbs/feature/advapp-25-26-21-graphq…
Orrison Dec 21, 2023
acaa6f2
Fix namespace for graphql file.
dgoetzit Dec 21, 2023
149a4d0
Merge branch 'develop' into feature/advapp-18-unify-notifications
dgoetzit Dec 21, 2023
33d8973
update lock
dgoetzit Dec 21, 2023
3c596ed
remove todo, add interface.
dgoetzit Dec 21, 2023
bd41de2
Update graphql reference.
dgoetzit Dec 21, 2023
6c2127d
Add dispatched delivery status.
dgoetzit Dec 21, 2023
7670962
Update column.
dgoetzit Dec 21, 2023
eda5b14
Remove comment.
dgoetzit Dec 21, 2023
b3e5593
Update outbound deliverable notifiable key.
dgoetzit Dec 21, 2023
4057e75
Update EditProspectTest.php
danharrin Dec 21, 2023
0790bf0
Merge pull request #387 from canyongbs/feature/advapp-18-unify-notifi…
Orrison Dec 21, 2023
901423e
Make sure the audit queue is specified
Orrison Dec 21, 2023
81bad47
Merge branch 'develop' into advapp-20
Orrison Dec 21, 2023
523d4cb
Merge pull request #388 from canyongbs/advapp-20
Orrison Dec 21, 2023
6c537a2
Merge pull request #390 from canyongbs/feature/ADVAPP-13-queued-jobs-…
Orrison Dec 21, 2023
8b71987
Merge branch 'develop' into advapp-20
Orrison Dec 21, 2023
f0595f3
Merge pull request #391 from canyongbs/feature/fix-subscription
mxm1070 Dec 21, 2023
ff01a71
Fix.
mxm1070 Dec 21, 2023
3787c6f
Merge pull request #392 from canyongbs/fix/graphql-subscription
Orrison Dec 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ AWS_USE_PATH_STYLE_ENDPOINT=true

AWS_URL=http://localhost:9000/local

AWS_SQS_ACCESS_KEY_ID=
AWS_SQS_SECRET_ACCESS_KEY=

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
Expand Down
251 changes: 246 additions & 5 deletions _ide_helper_models.php

Large diffs are not rendered by default.

132 changes: 132 additions & 0 deletions app-modules/alert/graphql/alert.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
type Alert @model(class: "AdvisingApp\\Alert\\Models\\Alert") {
"Unique primary key."
id: UUID!

"The Concern of the alert."
concern: Educatable! @morphTo

"The description of the alert."
description: String!

"The severity of the alert."
severity: AlertSeverity!

"The status of the alert."
status: AlertStatus!

"The suggested intervention for the alert."
suggested_intervention: String!

"The created datetime of the alert."
created_at: DateTime

"The updated datetime of the alert."
updated_at: DateTime

"The deleted datetime of the alert."
deleted_at: DateTime
}

input AlertConcernsQuery {
student: StudentsQuery
prospect: ProspectsQuery
}

input AlertsQuery {
id: UUID
concern: AlertConcernsQuery @morphToRelation
concern_id: EducatableId
concern_type: EducatableType
description: String
severity: AlertSeverity
status: AlertStatus
suggested_intervention: String
created_at: DateTime
updated_at: DateTime
deleted_at: DateTime
}

type AlertQueries {
"Find a single alert by an identifying attribute."
find(
"The value of the attribute to match."
id: UUID! @whereKey @rules(apply: ["required", "uuid", "exists:alerts"])
): Alert @find @softDeletes @canResolved(ability: "view")

"List multiple alerts."
list(where: AlertsQuery @searchBy): [Alert!]!
@paginate
@softDeletes
@canModel(ability: "viewAny")
}

extend type Query {
alert: AlertQueries! @namespaced
}

input CreateAlertInput {
"The Concern related to the alert."
concern_id: EducatableId!
@rules(
apply: [
"required"
"AdvisingApp\\Alert\\Rules\\ConcernIdExistsRule"
]
)

"The type of Concern related to the alert."
concern_type: EducatableType!
@rules(apply: ["required", "in:student,prospect"])

"The description of the alert."
description: String! @rules(apply: ["required", "string"])

"The severity of the alert."
severity: AlertSeverity! @rules(apply: ["required"])

"The status of the alert."
status: AlertStatus! @rules(apply: ["required"])

"The suggested intervention for the alert."
suggested_intervention: String! @rules(apply: ["required", "string"])
}

input UpdateAlertInput {
"The description of the alert."
description: String @rules(apply: ["filled", "string"])

"The severity of the alert."
severity: AlertSeverity @rules(apply: ["filled"])

"The status of the alert."
status: AlertStatus @rules(apply: ["filled"])

"The suggested intervention for the alert."
suggested_intervention: String @rules(apply: ["filled", "string"])
}

type AlertMutations {
"Create an alert."
create(input: CreateAlertInput! @spread): Alert!
@create
@canModel(ability: "create")

"Update an alert."
update(
"The identifier of the alert you would like to update."
id: UUID! @whereKey @rules(apply: ["required", "uuid", "exists:alerts"])

"The fields you would like to update."
input: UpdateAlertInput! @spread
): Alert! @update @canFind(ability: "update", find: "id")

"Delete an alert."
delete(
"The identifier of the alert you would like to delete."
id: UUID! @whereKey @rules(apply: ["required", "uuid", "exists:alerts"])
): Alert @delete @canFind(ability: "delete", find: "id")
}

extend type Mutation {
alert: AlertMutations! @namespaced
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
use AdvisingApp\Alert\Events\AlertCreated;
use Illuminate\Contracts\Queue\ShouldQueue;
use AdvisingApp\StudentDataModel\Models\Student;
use AdvisingApp\Notifications\Models\Subscription;
use AdvisingApp\Notification\Models\Subscription;
use AdvisingApp\Alert\Notifications\AlertCreatedNotification;

class NotifySubscribersOfAlertCreated implements ShouldQueue
Expand Down
4 changes: 2 additions & 2 deletions app-modules/alert/src/Models/Alert.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
use AdvisingApp\Campaign\Models\CampaignAction;
use AdvisingApp\StudentDataModel\Models\Student;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use AdvisingApp\Notifications\Models\Contracts\Subscribable;
use AdvisingApp\Notification\Models\Contracts\Subscribable;
use AdvisingApp\StudentDataModel\Models\Contracts\Educatable;
use AdvisingApp\Audit\Models\Concerns\Auditable as AuditableTrait;
use AdvisingApp\Campaign\Models\Contracts\ExecutableFromACampaignAction;
use AdvisingApp\Notifications\Models\Contracts\CanTriggerAutoSubscription;
use AdvisingApp\Notification\Models\Contracts\CanTriggerAutoSubscription;

/**
* @property-read Student|Prospect $concern
Expand Down
11 changes: 7 additions & 4 deletions app-modules/alert/src/Observers/AlertObserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,19 @@

namespace AdvisingApp\Alert\Observers;

use App\Models\User;
use AdvisingApp\Alert\Models\Alert;
use Illuminate\Support\Facades\Cache;
use AdvisingApp\Alert\Events\AlertCreated;
use AdvisingApp\Notifications\Actions\SubscriptionCreate;
use AdvisingApp\Notification\Actions\SubscriptionCreate;

class AlertObserver
{
public function created(Alert $alert): void
{
if ($user = auth()->user()) {
$user = auth()->user();

if ($user instanceof User) {
// Creating the subscription directly so that the alert can be sent to this User as well
resolve(SubscriptionCreate::class)->handle($user, $alert->getSubscribable(), false);
}
Expand All @@ -55,11 +58,11 @@ public function created(Alert $alert): void

public function saved(Alert $alert): void
{
Cache::tags('alert-count')->flush();
Cache::tags('{alert-count}')->flush();
}

public function deleted(Alert $alert): void
{
Cache::tags('alert-count')->flush();
Cache::tags('{alert-count}')->flush();
}
}
17 changes: 16 additions & 1 deletion app-modules/alert/src/Providers/AlertServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
use AdvisingApp\Alert\AlertPlugin;
use AdvisingApp\Alert\Models\Alert;
use Illuminate\Support\Facades\Event;
use App\Concerns\GraphSchemaDiscovery;
use Illuminate\Support\ServiceProvider;
use AdvisingApp\Alert\Enums\AlertStatus;
use AdvisingApp\Alert\Enums\AlertSeverity;
use AdvisingApp\Alert\Events\AlertCreated;
use AdvisingApp\Alert\Observers\AlertObserver;
use Illuminate\Database\Eloquent\Relations\Relation;
Expand All @@ -50,6 +53,8 @@

class AlertServiceProvider extends ServiceProvider
{
use GraphSchemaDiscovery;

public function register(): void
{
Panel::configureUsing(fn (Panel $panel) => $panel->plugin(new AlertPlugin()));
Expand All @@ -66,9 +71,11 @@ public function boot(): void
$this->registerObservers();

$this->registerEvents();

$this->registerGraphQL();
}

protected function registerRolesAndPermissions()
protected function registerRolesAndPermissions(): void
{
$permissionRegistry = app(AuthorizationPermissionRegistry::class);

Expand Down Expand Up @@ -107,4 +114,12 @@ protected function registerEvents(): void
NotifySubscribersOfAlertCreated::class
);
}

protected function registerGraphQL(): void
{
$this->discoverSchema(__DIR__ . '/../../graphql/alert.graphql');

$this->registerEnum(AlertSeverity::class);
$this->registerEnum(AlertStatus::class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,36 @@
</COPYRIGHT>
*/

namespace AdvisingApp\Engagement\Notifications;
namespace AdvisingApp\Alert\Rules;

use Illuminate\Bus\Queueable;
use App\Notifications\MailMessage;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use AdvisingApp\Engagement\Models\EngagementDeliverable;
use Closure;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Validation\DataAwareRule;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Database\Eloquent\Relations\Relation;

class EngagementNotification extends Notification implements ShouldQueue
class ConcernIdExistsRule implements DataAwareRule, ValidationRule
{
use Queueable;
protected $data = [];

public function __construct(
public EngagementDeliverable $deliverable
) {}

public function via(object $notifiable): array
public function validate(string $attribute, mixed $value, Closure $fail): void
{
return ['mail'];
$type = $this->data['input']['concern_type'];

/** @var ?Model $morph */
$morph = Relation::getMorphedModel($type);

if (! $morph) {
$fail('The concern type must be either student or prospect.');
} elseif ($morph::query()->whereKey($value)->doesntExist()) {
$fail('The concern does not exist.');
}
}

public function toMail(object $notifiable): MailMessage
public function setData(array $data): static
{
return MailMessage::make()
->subject($this->deliverable->engagement->subject)
->greeting('Hello ' . $this->deliverable->engagement->recipient->display_name . '!')
->content($this->deliverable->engagement->getBody())
->salutation("Regards, {$this->deliverable->engagement->user->name}");
$this->data = $data;

return $this;
}
}
1 change: 1 addition & 0 deletions app-modules/application/routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
</COPYRIGHT>
*/

use Illuminate\Support\Facades\Route;
use AdvisingApp\Application\Http\Controllers\ApplicationWidgetController;
use AdvisingApp\Form\Http\Middleware\EnsureSubmissibleIsEmbeddableAndAuthorized;
use AdvisingApp\Application\Http\Middleware\EnsureOnlineAdmissionsFeatureIsActive;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
use AdvisingApp\Prospect\Models\Prospect;
use Illuminate\Contracts\Queue\ShouldQueue;
use AdvisingApp\StudentDataModel\Models\Student;
use AdvisingApp\Notifications\Models\Subscription;
use AdvisingApp\Notification\Models\Subscription;
use AdvisingApp\Application\Events\ApplicationSubmissionCreated;
use AdvisingApp\Application\Notifications\AuthorLinkedApplicationSubmissionCreatedNotification;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public function created(ApplicationSubmission $submission): void
);

if (! is_null($submission->author)) {
Cache::tags('application-submission-count')
Cache::tags('{application-submission-count}')
->forget(
"application-submission-count-{$submission->author->getKey()}"
"{application-submission-count-{$submission->author->getKey()}}"
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@

?>

<x-filament-panels::page
class="max-h-screen"
full-height="true"
>
<x-filament-panels::page full-height="true">
<div
class="flex h-full flex-col"
wire:init="determineIfConsentWasGiven"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

use App\Models\User;
use Illuminate\Bus\Queueable;
use App\Notifications\MailMessage;
use App\Models\NotificationSetting;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use AdvisingApp\Assistant\Models\AssistantChat;
use AdvisingApp\Notification\Notifications\Messages\MailMessage;
use AdvisingApp\Assistant\Services\AIInterface\Enums\AIChatMessageFrom;

class SendAssistantTranscriptNotification extends Notification implements ShouldQueue
Expand Down
3 changes: 2 additions & 1 deletion app-modules/audit/config/audit.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
'guards' => [
'web',
'api',
'sanctum',
],
'resolver' => OwenIt\Auditing\Resolvers\UserResolver::class,
],
Expand Down Expand Up @@ -204,7 +205,7 @@
'queue' => [
'dispatch_listener' => ProcessDispatchAudit::class,
'connection' => env('AUDIT_QUEUE_CONNECTION', 'sync'),
'queue' => 'default',
'queue' => env('SQS_QUEUE', 'default'),
'delay' => 0,
],

Expand Down
4 changes: 3 additions & 1 deletion app-modules/campaign/config/permissions/web/custom.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
</COPYRIGHT>
*/

return [];
return [
'view_campaign_settings',
];
Loading