Skip to content

Commit 635920d

Browse files
feat: change ScheduleWork id to string
1 parent 20d7fbf commit 635920d

15 files changed

Lines changed: 34 additions & 72 deletions

File tree

HwProj.Common/HwProj.Models/HwProj.Models.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17+
<ProjectReference Include="..\..\HwProj.EventBus\HwProj.EventBus.Client\HwProj.EventBus.Client.csproj" />
1718
<ProjectReference Include="..\HwProj.Repositories\HwProj.Repositories.csproj" />
1819
</ItemGroup>
1920

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
namespace HwProj.Models.NotificationsService
1+
using System.ComponentModel.DataAnnotations;
2+
using HwProj.Repositories;
3+
4+
5+
namespace HwProj.Models.NotificationsService
26
{
3-
public class ScheduleWork
7+
public class ScheduleWork : IEntity<string>
48
{
5-
private long _taskId;
6-
private long _homeworkId;
7-
private long _courseId;
8-
9-
public long? TaskId
10-
{
11-
get => _taskId;
12-
set => _taskId = value ?? -1;
13-
}
9+
[Key] public string Id { get; set; }
10+
public string JobId { get; set; }
11+
}
1412

15-
public long? HomeworkId
13+
public static class ScheduleWorkIdBuilder
14+
{
15+
public static string Build(string eventName, long id)
1616
{
17-
get => _homeworkId;
18-
set => _homeworkId = value ?? -1;
19-
}
17+
//TODO: fill
18+
var category = eventName switch
19+
{
20+
_ when eventName.Equals("NewHomeworkTaskEvent") || eventName.Equals("UpdateTaskMaxRatingEvent") ||
21+
eventName.Equals("UpdateSolutionMaxRatingEvent")
22+
=> "Task",
23+
_ when eventName.Equals("NewHomeworkEvent")
24+
=> "Homework",
25+
_ => "Unknown"
26+
};
2027

21-
public long? CourseId
22-
{
23-
get => _courseId;
24-
set => _courseId = value ?? -1;
28+
return $"{category}/{id}";
2529
}
26-
27-
public string CategoryId { get; set; }
28-
29-
public string JobId { get; set; }
3030
}
3131
}

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerAcceptToCourseEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/LecturerAcceptToCourseEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerInvitedToCourseEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/LecturerInvitedToCourseEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/LecturerRejectToCourseEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/LecturerRejectToCourseEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewCourseMateEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/NewCourseMateEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewHomeworkEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/NewHomeworkEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/NewHomeworkTaskEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/NewHomeworkTaskEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/UpdateHomeworkEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/UpdateHomeworkEvent.cs

File renamed without changes.

HwProj.CoursesService/HwProj.CoursesService.API/Events/UpdateSolutionMaxRatingEvent.cs renamed to HwProj.CoursesService/HwProj.CoursesService.API/Controllers/Events/UpdateSolutionMaxRatingEvent.cs

File renamed without changes.

0 commit comments

Comments
 (0)