Start now

backend/.idea/workspace.xml

@@ -4,11 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Delete Schedules">
+    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Removed unused TaskgroupShortInfo.java">
-      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/tasks/TaskShortInfo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/app/schedules/scheduler/scheduler.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/entities/timemanager/Task.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/api/api/schedule.service.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../openapi.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../openapi.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -27,7 +29,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$/.." value="master" />
+        <entry key="$PROJECT_DIR$/.." value="issue-23" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
@@ -156,7 +158,15 @@
       <option name="project" value="LOCAL" />
       <updated>1698089745245</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="Removed unused TaskgroupShortInfo.java">
+      <option name="closed" value="true" />
+      <created>1698168406655</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1698168406655</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -171,7 +181,9 @@
     <MESSAGE value="Delete and clear Tasks (Frontend)" />
     <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
     <MESSAGE value="Delete Schedules" />
-    <option name="LAST_COMMIT_MESSAGE" value="Delete Schedules" />
+    <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
+    <MESSAGE value="Removed unused TaskgroupShortInfo.java" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removed unused TaskgroupShortInfo.java" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

backend/src/main/java/core/api/controller/ScheduleController.java

@@ -121,4 +121,22 @@ public class ScheduleController {
             return ResponseEntity.ok(schedules.getResult().stream().map(ScheduleInfo::new).toList());
         }
     }
+    @PostMapping("/schedules/{taskID}/now")
+    public ResponseEntity<?> scheduleTaskNow(@PathVariable long taskID) {
+        PermissionResult<Task> permissionResult = taskService.getTaskPermissions(taskID, SecurityContextHolder.getContext().getAuthentication().getName());
+        if(!permissionResult.isHasPermissions()) {
+            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
+        }
+
+        if(permissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
+            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
+        }
+
+        ServiceResult<BasicTaskSchedule> scheduleResult = taskScheduleService.scheduleTaskNow(permissionResult.getResult());
+        if(scheduleResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
+            return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
+        } else {
+            return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(scheduleResult.getResult()));
+        }
+    }
 }

backend/src/main/java/core/entities/timemanager/Task.java

@@ -135,4 +135,13 @@ public class Task {
     public void setBasicTaskSchedules(Set<BasicTaskSchedule> basicTaskSchedules) {
         this.basicTaskSchedules = basicTaskSchedules;
     }
+
+    public boolean hasActiveSchedule() {
+        for(BasicTaskSchedule basicTaskSchedule : basicTaskSchedules) {
+           if(basicTaskSchedule.getStartTime() != null && basicTaskSchedule.getFinishedTime() == null) {
+               return true;
+           }
+        }
+        return false;
+    }
 }

backend/src/main/java/core/services/TaskScheduleService.java

@@ -63,4 +63,17 @@ public class TaskScheduleService {
         return user.map(value -> new ServiceResult<>(basicTaskScheduleRepository.findAllByUser(value))).orElseGet(() ->
                 new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
     }
+
+    public ServiceResult<BasicTaskSchedule> scheduleTaskNow(Task task) {
+        //Check if task has already an active schedule
+        if(task.hasActiveSchedule()) {
+            return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
+        } else {
+            BasicTaskSchedule basicTaskSchedule = new BasicTaskSchedule(task, LocalDate.now());
+            task.getBasicTaskSchedules().add(basicTaskSchedule);
+            basicTaskScheduleRepository.save(basicTaskSchedule);
+            taskRepository.save(task);
+            return new ServiceResult<>(basicTaskSchedule);
+        }
+    }
 }

frontend/src/api/api/schedule.service.ts

@@ -346,6 +346,66 @@ export class ScheduleService {
         );
     }
 
+    /**
+     * schedule task now
+     * schedule task now
+     * @param taskID internal id of task
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<BasicScheduleEntityInfo>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDNowPost(taskID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<BasicScheduleEntityInfo>>;
+    public schedulesTaskIDNowPost(taskID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
+        if (taskID === null || taskID === undefined) {
+            throw new Error('Required parameter taskID was null or undefined when calling schedulesTaskIDNowPost.');
+        }
+
+        let localVarHeaders = this.defaultHeaders;
+
+        let localVarCredential: string | undefined;
+        // authentication (API_TOKEN) required
+        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
+        if (localVarCredential) {
+            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
+        }
+
+        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
+        if (localVarHttpHeaderAcceptSelected === undefined) {
+            // to determine the Accept header
+            const httpHeaderAccepts: string[] = [
+                'application/json'
+            ];
+            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        }
+        if (localVarHttpHeaderAcceptSelected !== undefined) {
+            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
+        }
+
+        let localVarHttpContext: HttpContext | undefined = options && options.context;
+        if (localVarHttpContext === undefined) {
+            localVarHttpContext = new HttpContext();
+        }
+
+
+        let responseType_: 'text' | 'json' = 'json';
+        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
+            responseType_ = 'text';
+        }
+
+        return this.httpClient.post<BasicScheduleEntityInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(taskID))}/now`,
+            null,
+            {
+                context: localVarHttpContext,
+                responseType: <any>responseType_,
+                withCredentials: this.configuration.withCredentials,
+                headers: localVarHeaders,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * gets schedules of task
      * gets schedules of task

frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.html

@@ -20,7 +20,7 @@
       <div style="width: 100%">
         <div style="float: left">
           <button mat-flat-button class="borderless-btn" color="primary" [routerLink]="['/taskgroups', taskgroup!.taskgroupID, 'tasks', task!.taskID, 'schedule']">Schedule</button>
-          <button mat-flat-button class="yellowBtn">Start now</button>
+          <button mat-flat-button class="yellowBtn" (click)="startTaskNow()">Start now</button>
           <button mat-flat-button class="grayBtn" (click)="openTaskEditor()">Edit</button>
           <!--<button mat-raised-button>Copy</button>-->
           <button mat-flat-button class="greenBtn" >Finished</button>

frontend/src/app/tasks/task-detail-overview/task-detail-overview.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
 import {NavigationLink, NavigationLinkListComponent} from "../../navigation-link-list/navigation-link-list.component";
-import {ActivatedRoute} from "@angular/router";
+import {ActivatedRoute, Router} from "@angular/router";
-import {TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
+import {ScheduleService, TaskEntityInfo, TaskgroupEntityInfo, TaskgroupService, TaskService} from "../../../api";
 import {TaskDashboardComponent} from "../task-dashboard/task-dashboard.component";
 import {MatDialog} from "@angular/material/dialog";
 import {TaskEditorComponent} from "../task-editor/task-editor.component";
@@ -35,7 +35,9 @@ export class TaskDetailOverviewComponent implements OnInit {
   constructor(private activatedRoute: ActivatedRoute,
               private taskgroupService: TaskgroupService,
               private taskService: TaskService,
-              private dialog: MatDialog) {
+              private dialog: MatDialog,
+              private scheduleService: ScheduleService,
+              private router: Router) {
   }
 
   ngOnInit(): void {
@@ -80,4 +82,14 @@ export class TaskDetailOverviewComponent implements OnInit {
     }
 
   }
+
+  startTaskNow() {
+    if(this.task != undefined) {
+      this.scheduleService.schedulesTaskIDNowPost(this.task.taskID).subscribe({
+        next: resp => {
+          this.router.navigateByUrl('/');
+        }
+      });
+    }
+  }
 }

openapi.yaml

@@ -1372,6 +1372,52 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/ScheduleInfo'
+  /schedules/{taskID}/now:
+    post:
+      security:
+        - API_TOKEN: []
+      tags:
+        - schedule
+      description: schedule task now
+      summary: schedule task now
+      parameters:
+        - name: taskID
+          in: path
+          description: internal id of task
+          required: true
+          schema:
+            type: number
+            example: 1
+      responses:
+        200:
+          description: Operation successfull
+          content:
+            application/json:
+              schema:
+                type: object
+                $ref: '#/components/schemas/BasicScheduleEntityInfo'
+        403:
+          description: No permission
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        404:
+          description: Taskgroup does not exist
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+        409:
+          description: Task is already running
+          content:
+            'application/json':
+              schema:
+                type: object
+                $ref: "#/components/schemas/SimpleStatusResponse"
+      
       
 components:
   securitySchemes: