Fixes on exercise loading out of ssr

Author: Mateus Medeiros

src/propositions-service/WriteFluency.Application.Contracts/Propositions/Dtos/ExerciseListItemDto.cs

@@ -7,5 +7,6 @@ public record ExerciseListItemDto(
     ComplexityEnum Level,
     DateTime PublishedOn,
     string? ImageFileId,
-    int AudioDurationSeconds
+    int AudioDurationSeconds,
+    string NewsUrl
 );

src/propositions-service/WriteFluency.Application/Propositions/Servies/PropositionService.cs

@@ -189,7 +189,8 @@ public async Task<PagedResultDto<ExerciseListItemDto>> GetExercisesAsync(
                 p.ComplexityId,
                 p.PublishedOn,
                 p.ImageFileId,
-                p.AudioDurationSeconds
+                p.AudioDurationSeconds,
+                p.NewsInfo.Url
             ))
             .ToListAsync(cancellationToken);
 

src/webapp/src/api/listen-and-write/.openapi-generator/FILES

@@ -4,11 +4,8 @@ api.base.service.ts
 api.module.ts
 api/api.ts
 api/authentication.service.ts
-api/authentication.serviceInterface.ts
 api/propositions.service.ts
-api/propositions.serviceInterface.ts
 api/textComparisons.service.ts
-api/textComparisons.serviceInterface.ts
 configuration.ts
 encoder.ts
 git_push.sh
@@ -18,15 +15,14 @@ model/complexity.ts
 model/complexityEnum.ts
 model/exerciseListItemDto.ts
 model/exerciseListItemDtoPagedResultDto.ts
-model/getPropositionDto.ts
 model/iError.ts
 model/iReason.ts
 model/iSuccess.ts
 model/loginRequest.ts
 model/models.ts
 model/newsInfo.ts
 model/proposition.ts
-model/propositionDto.ts
+model/propositionGenerationLog.ts
 model/registerUserRequest.ts
 model/subject.ts
 model/subjectEnum.ts

src/webapp/src/api/listen-and-write/api/api.ts

@@ -1,10 +1,7 @@
 export * from './authentication.service';
 import { AuthenticationService } from './authentication.service';
-export * from './authentication.serviceInterface';
 export * from './propositions.service';
 import { PropositionsService } from './propositions.service';
-export * from './propositions.serviceInterface';
 export * from './textComparisons.service';
 import { TextComparisonsService } from './textComparisons.service';
-export * from './textComparisons.serviceInterface';
 export const APIS = [AuthenticationService, PropositionsService, TextComparisonsService];

src/webapp/src/api/listen-and-write/api/authentication.service.ts

@@ -27,16 +27,13 @@ import { ValidationProblemDetails } from '../model/validationProblemDetails';
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
 import { BaseService } from '../api.base.service';
-import {
-    AuthenticationServiceInterface
-} from './authentication.serviceInterface';
 
 
 
 @Injectable({
   providedIn: 'root'
 })
-export class AuthenticationService extends BaseService implements AuthenticationServiceInterface {
+export class AuthenticationService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
         super(basePath, configuration);

src/webapp/src/api/listen-and-write/api/propositions.service.ts

@@ -19,28 +19,21 @@ import { OpenApiHttpParams, QueryParamStyle } from '../query.params';
 // @ts-ignore
 import { ExerciseListItemDtoPagedResultDto } from '../model/exerciseListItemDtoPagedResultDto';
 // @ts-ignore
-import { GetPropositionDto } from '../model/getPropositionDto';
-// @ts-ignore
 import { Proposition } from '../model/proposition';
 // @ts-ignore
-import { PropositionDto } from '../model/propositionDto';
-// @ts-ignore
 import { TopicsDtoResult } from '../model/topicsDtoResult';
 
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
 import { BaseService } from '../api.base.service';
-import {
-    PropositionsServiceInterface
-} from './propositions.serviceInterface';
 
 
 
 @Injectable({
   providedIn: 'root'
 })
-export class PropositionsService extends BaseService implements PropositionsServiceInterface {
+export class PropositionsService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
         super(basePath, configuration);
@@ -156,77 +149,6 @@ export class PropositionsService extends BaseService implements PropositionsServ
         );
     }
 
-    /**
-     * @endpoint post /api/proposition/generate-proposition
-     * @param getPropositionDto 
-     * @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.
-     * @param options additional options
-     */
-    public apiPropositionGeneratePropositionPost(getPropositionDto: GetPropositionDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<PropositionDto>;
-    public apiPropositionGeneratePropositionPost(getPropositionDto: GetPropositionDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<PropositionDto>>;
-    public apiPropositionGeneratePropositionPost(getPropositionDto: GetPropositionDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<PropositionDto>>;
-    public apiPropositionGeneratePropositionPost(getPropositionDto: GetPropositionDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext, transferCache?: boolean}): Observable<any> {
-        if (getPropositionDto === null || getPropositionDto === undefined) {
-            throw new Error('Required parameter getPropositionDto was null or undefined when calling apiPropositionGeneratePropositionPost.');
-        }
-
-        let localVarHeaders = this.defaultHeaders;
-
-        // authentication (google) required
-        localVarHeaders = this.configuration.addCredentialToHeaders('google', 'Authorization', localVarHeaders, 'Bearer ');
-
-        // authentication (jwt_auth) required
-        localVarHeaders = this.configuration.addCredentialToHeaders('jwt_auth', 'Authorization', localVarHeaders, 'Bearer ');
-
-        const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([
-            'application/json'
-        ]);
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        const localVarHttpContext: HttpContext = options?.context ?? new HttpContext();
-
-        const localVarTransferCache: boolean = options?.transferCache ?? true;
-
-
-        // to determine the Content-Type header
-        const consumes: string[] = [
-            'application/json'
-        ];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
-        if (httpContentTypeSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
-        }
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/api/proposition/generate-proposition`;
-        const { basePath, withCredentials } = this.configuration;
-        return this.httpClient.request<PropositionDto>('post', `${basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                body: getPropositionDto,
-                responseType: <any>responseType_,
-                ...(withCredentials ? { withCredentials } : {}),
-                headers: localVarHeaders,
-                observe: observe,
-                ...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}),
-                reportProgress: reportProgress
-            }
-        );
-    }
-
     /**
      * @endpoint get /api/proposition/{id}
      * @param id 

src/webapp/src/api/listen-and-write/api/textComparisons.service.ts

@@ -25,16 +25,13 @@ import { TextComparisonResult } from '../model/textComparisonResult';
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';
 import { BaseService } from '../api.base.service';
-import {
-    TextComparisonsServiceInterface
-} from './textComparisons.serviceInterface';
 
 
 
 @Injectable({
   providedIn: 'root'
 })
-export class TextComparisonsService extends BaseService implements TextComparisonsServiceInterface {
+export class TextComparisonsService extends BaseService {
 
     constructor(protected httpClient: HttpClient, @Optional() @Inject(BASE_PATH) basePath: string|string[], @Optional() configuration?: Configuration) {
         super(basePath, configuration);

src/webapp/src/api/listen-and-write/model/exerciseListItemDto.ts

@@ -19,6 +19,7 @@ export interface ExerciseListItemDto {
     publishedOn?: string;
     imageFileId?: string | null;
     audioDurationSeconds?: number;
+    newsUrl?: string | null;
 }
 export namespace ExerciseListItemDto {
 }

src/webapp/src/api/listen-and-write/model/models.ts

@@ -3,14 +3,13 @@ export * from './complexity';
 export * from './complexityEnum';
 export * from './exerciseListItemDto';
 export * from './exerciseListItemDtoPagedResultDto';
-export * from './getPropositionDto';
 export * from './iError';
 export * from './iReason';
 export * from './iSuccess';
 export * from './loginRequest';
 export * from './newsInfo';
 export * from './proposition';
-export * from './propositionDto';
+export * from './propositionGenerationLog';
 export * from './registerUserRequest';
 export * from './subject';
 export * from './subjectEnum';

src/webapp/src/api/listen-and-write/model/proposition.ts

@@ -9,6 +9,7 @@
  */
 import { SubjectEnum } from './subjectEnum';
 import { NewsInfo } from './newsInfo';
+import { PropositionGenerationLog } from './propositionGenerationLog';
 import { Subject } from './subject';
 import { Complexity } from './complexity';
 import { ComplexityEnum } from './complexityEnum';
@@ -27,6 +28,10 @@ export interface Proposition {
     title?: string | null;
     imageFileId?: string | null;
     createdAt?: string;
+    isDeleted?: boolean;
+    deletedAt?: string | null;
+    propositionGenerationLogId?: number | null;
+    propositionGenerationLog?: PropositionGenerationLog;
     newsInfo?: NewsInfo;
     complexity?: Complexity;
     subject?: Subject;