System: Modifying entity with annotations for user_id. the previous one is commented #3464

carlangas159 · 2020-08-20T22:48:41Z

All found user_ids have been changed to conform to annotated doctrine. The previous elements remain commented for security - refs #3463

…nted

FlintCIBot · 2020-08-20T22:52:49Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/39879

This comment was posted by FlintCI. It can be disabled in the repository settings.

src/CoreBundle/Entity/ClassUser.php

src/CoreBundle/Entity/GradebookCertificate.php

src/CoreBundle/Entity/GradebookEvaluation.php

src/CoreBundle/Entity/GradebookLink.php

src/CoreBundle/Entity/GradebookResult.php

src/CoreBundle/Entity/GradebookResultLog.php

AngelFQC

The value for inversedBy in JoinColumn annotation is incorrect. Because it should be the class property in otherside entity.

src/CoreBundle/Entity/UserRelUser.php

src/CoreBundle/Entity/UserRelTag.php

src/CoreBundle/Entity/UserRelCourseVote.php

jmontoyaa · 2020-09-02T06:32:46Z

@carlangas159 Algun update de este PR?

…precated - refs chamilo#3464

FlintCIBot · 2020-09-02T20:49:32Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/41979

This comment was posted by FlintCI. It can be disabled in the repository settings.

carlangas159 · 2020-09-02T20:51:18Z

He colocado algunas relaciones en las entidades, corrijanme si me equivoco por favor

$admin -> 1 admin / 1 user

$gradebookCertificate -> n gradebookCertificate / 1 user
$gradebookEvaluation -> n gradebookEvaluation / 1 user
$gradebookLink -> n gradebookLink / 1 user
$gradebookResult -> n gradebookResult / 1 user
$gradebookResultLog -> n gradebookResultLog / 1 user
$gradebookScoreLog -> n gradebookScoreLog / 1 user
$sequenceValue -> n sequenceValue / 1 user
$trackEAttemp -> n trackEAttemp / 1 user
$trackECourseAccessRepository -> n trackECourseAccessRepository / 1 user
$userCourseCategory -> n userCourseCategory / n1 user
$userRelCourseVote -> n userRelCourseVote / 1 user
$userRelTag -> n userRelTag / 1 user
$userRelUser -> n userRelUser / 1 user

$templates -> n templates / 1 user - tengo dudas sobre este

He colocado la asociación de inversedBy en user respectivamente como lo especifica angel (muchisimas gracias), sin embargo, no estoy seguro si estas relaciones de 1 a muchos esten totalmente correctas.

Intente aplicar un patch de flinci pero se modifican muchos archivos y estructuras, por ahora lo dejo sin aplicar.

@jmontoyaa

* CHAMILO/master: (187 commits) Internal: Remove unused code, fix php warning Internal: Improve document list view Internal: Add js lib pretty-bytes Internal: Remove unused properties. Internal: Remove unused Cdocument properties Internal: Fix coding standards Set body padding to show breadcrumb Show footer Minor - format code Internal: Fix return resource list Internal: Fix table sorting and pagination Internal: Refactor view URL, improve show file page, fix js errors Internal: Remove unused social/download.php Internal: Minor - Add AccessDeniedHandler.php Customize sidebar Internal: Fix LINK crud Internal: Update yarn.lock Internal: Fix queries, use iid instead of id Internal: Add course list change button layout Internal: Add course list layout ...

FlintCIBot · 2020-09-02T21:11:06Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/41981

This comment was posted by FlintCI. It can be disabled in the repository settings.

…el to userRelationship - refs chamilo#3464

FlintCIBot · 2020-09-03T16:26:24Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/42059

This comment was posted by FlintCI. It can be disabled in the repository settings.

jmontoyaa · 2020-09-07T14:25:01Z

Aún no agregar api platform este PR es solo de las entidades de usuario.

src/CoreBundle/Entity/Admin.php

src/CoreBundle/Entity/GradebookCertificate.php

src/CoreBundle/Entity/SequenceValue.php

src/CoreBundle/Entity/TrackEAttempt.php

src/CoreBundle/Entity/User.php

* CHAMILO/master: (23 commits) Internal: Add "All" option in document list + add translations. Internal: Add psalm fixes Internal: Add justification plugin from 1.11.x Internal: Add files to psalm, fix psalm errors. Internal: Remove vuetify components, replace with bootstrap-vue Internal: Remove vuetify from vue.js Internal: Remove c_id, session_id from CAttendance.php Internal: Format code, remove unused code, add psalm check dirs Internal: Remove unused bundle Internal: Update forms with bootstrap v4 Internal: Fix php fatal error Internal: Fix update error Internal: Add title when saving a new resource Internal: Fix folder creation via api Internal: Replace deprecated datetimepicker with flatpickr Internal: Add requiresAuth in vue pages Internal: Improve conditional nav in sidebar Internal: Sidebar show admin links to admin Internal: Use mapGetter to get store properties Internal: Fix add course when creating course ... # Conflicts: # src/CoreBundle/Entity/User.php

…d functions. The following variables have been placed in the plural: > $gradebookCertificates > $gradebookEvaluations > $gradebookLinks > $gradebookResults > $gradebookResultLogs > $gradebookScoreLogs > $sequenceValues > $trackEExerciseConfirmations > $templates > $trackEAttemps > $trackECourseAccess > $userCourseCategorys > $userRelCourseVotes > $userRelTags > $gradebookLinkevalLogs > $userRelationships - refs chamilo#3464

FlintCIBot · 2020-09-07T17:08:59Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/42401

This comment was posted by FlintCI. It can be disabled in the repository settings.

codeclimate · 2020-09-07T17:30:46Z

src/CoreBundle/Entity/Admin.php

@@ -4,11 +4,25 @@

 namespace Chamilo\CoreBundle\Entity;

+use ApiPlatform\Core\Annotation\ApiFilter;


Possibly zero references to use statement for classlike/namespace ApiFilter (\ApiPlatform\Core\Annotation\ApiFilter)

codeclimate · 2020-09-07T17:30:46Z

src/CoreBundle/Entity/Admin.php

@@ -4,11 +4,25 @@

 namespace Chamilo\CoreBundle\Entity;

+use ApiPlatform\Core\Annotation\ApiFilter;
+use ApiPlatform\Core\Annotation\ApiResource;


Possibly zero references to use statement for classlike/namespace ApiResource (\ApiPlatform\Core\Annotation\ApiResource)

codeclimate · 2020-09-07T17:30:46Z

src/CoreBundle/Entity/Admin.php

@@ -4,11 +4,25 @@

 namespace Chamilo\CoreBundle\Entity;

+use ApiPlatform\Core\Annotation\ApiFilter;
+use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter;


Possibly zero references to use statement for classlike/namespace BooleanFilter (\ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter)

codeclimate · 2020-09-07T17:30:46Z

src/CoreBundle/Entity/Admin.php

+use ApiPlatform\Core\Annotation\ApiFilter;
+use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\BooleanFilter;
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;


Possibly zero references to use statement for classlike/namespace SearchFilter (\ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter)

codeclimate · 2020-09-07T17:30:47Z

src/CoreBundle/Entity/GradebookCertificate.php

@@ -4,11 +4,25 @@

 namespace Chamilo\CoreBundle\Entity;

+use ApiPlatform\Core\Annotation\ApiResource;


Possibly zero references to use statement for classlike/namespace ApiResource (\ApiPlatform\Core\Annotation\ApiResource)

… collectionOperations and itemOperations to get. Removed Duplicate attributes={"security"="is_granted('ROLE_ADMIN')"} from apiResoruce. - refs chamilo#3464

FlintCIBot · 2020-09-08T16:19:48Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/42442

This comment was posted by FlintCI. It can be disabled in the repository settings.

carlangas159 · 2020-09-08T16:28:32Z

Se han añadido los elementos de CourseBundle que tienen user_id.
Se ha ajustado los modelos para que api platform pueda cargarlos, por eso he añadido el siguiente bloque en el comentario de la clase en aquellas que no tenían dicha documentación

@ApiResource(
attributes={"security"="is_granted('ROLE_ADMIN')"},
iri="",
normalizationContext={"groups"={"user:read"}},
denormalizationContext={"groups"={"user:write"}},
collectionOperations={"get"},
itemOperations={"get"}
)

Para prevenir cualquier modificación actual por api, solo he dejado el metodo get asi se podria ir ajustando conforme se requiera.

También el las propiedades se ha añadido, según la documentación para apiplatform, el tipo y la propiedad, esto para que pueda ajustarse la documentación fácilmente.

@var User
@ApiProperty(iri="http://schema.org/Person")

También aplica para su contraparte en user.php

codeclimate

The PR diff size of 5970 lines exceeds the maximum allowed for the inline comments feature.

jmontoyaa · 2020-09-09T06:17:52Z

Como repito, favor de remover apiplatorm de este PR y efectuar los cambios solicitados solo para el tema de user id y doctrine.

No se ha solicitado implementar api platform todavía en todas la entidades.

FlintCIBot · 2020-09-09T13:40:59Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/42478

This comment was posted by FlintCI. It can be disabled in the repository settings.

codeclimate

The PR diff size of 5423 lines exceeds the maximum allowed for the inline comments feature.

FlintCIBot · 2020-09-09T14:14:31Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/42481

This comment was posted by FlintCI. It can be disabled in the repository settings.

jmontoyaa · 2020-09-09T14:18:39Z

Corregir lo que indica flint https://flintci.io/repositories/1013/analyses/42481

Una vez que flint valide el código revisar lo que indica el action PHP Composer / PHP 7.3

FlintCIBot · 2020-09-09T21:06:33Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/42491

This comment was posted by FlintCI. It can be disabled in the repository settings.

codeclimate

The PR diff size of 5194 lines exceeds the maximum allowed for the inline comments feature.

codeclimate

The PR diff size of 5160 lines exceeds the maximum allowed for the inline comments feature.

codeclimate

The PR diff size of 5160 lines exceeds the maximum allowed for the inline comments feature.

jmontoyaa · 2020-09-11T07:58:31Z

src/CoreBundle/Entity/TrackEAttempt.php

@@ -4,6 +4,7 @@

 namespace Chamilo\CoreBundle\Entity;

+use ApiPlatform\Core\Annotation\ApiProperty;


Eliminar clase

jmontoyaa · 2020-09-11T08:01:39Z

Sería una buena idea de usar traits en lugar de re escribir getUser y setUser, el trait puede ser creado aquí:

/srv/http/chamilo2/src/CoreBundle/Traits/UserTrait.php

Ya existe un trait para los cursos por si acaso:

/srv/http/chamilo2/src/CoreBundle/Traits/CourseTrait.php

jmontoyaa · 2020-09-11T10:16:07Z

Revisar que las funciones eliminadas sean reemplazadas:

Ejemplo:

Antes:

$userId = $obj->getUserId();

Después:

$userId = $obj->getUser()->getId();

* CHAMILO/master: (120 commits) Internal - Add behat tests, fix sql errors Internal - Add course registration behat test, fix php errors Internal - Minor - fix behat test Internal - Fix queries, fix installation, format code. Internal - Fix installation Internal - Add install logs Internal - Format code Internal - Fix behat tests Internal - Fix behat test Internal - Debug installation, remove unused field, fix deprecations. Internal - Improve global.inc.php loading (disable debug) +fix error tpl Internal - Fix behat tests Internal - Fix lang vars, fix course public URL Internal - Add voters when using api platform, fix documents visibility. Internal - Fix behat tests, fix lang vars Internal - Add permission to DRH to login as other user Internal - Fix behat tests, queries Internal - Fix php errors, use course.id instead of course.code Internal - Minor - tpl format code Internal - Fix group behat tests ... # Conflicts: # src/CoreBundle/Entity/User.php

…refs chamilo#3464

FlintCIBot · 2020-09-23T21:50:35Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/44755

This comment was posted by FlintCI. It can be disabled in the repository settings.

carlangas159 · 2020-09-23T21:53:48Z

Se han cambiado los setUser y getUser por la implementación de trait. sin embargo, no he podido evaluar aún setUser y getUser en código legacy, ya que debo generar el escenario para cada parte y poder probarlo

El cual afectaría para el momento de su ejecución.

He tratado de generar un escenario para quiz, añadiendo una pregunta a un ejercicio en un curso y me salio este aviso

Por lo momento, la verificación de remover setUserId para setUser tomará tiempo para poder evaluar cada elemento en legacy

codeclimate

The PR diff size of 5187 lines exceeds the maximum allowed for the inline comments feature.

* ChamiloMaster: Internal - Fix legacy code, use resources Internal - Fix queries, fix behat tests Internal - Fix queries, fix behat tests Internal - Fix LP creation Internal - Fix entities Internal - Fix fill courses Internal - Fix delete course Internal - Add behat debug Internal - Fix add course with content Internal - Fix behat test link Internal - Fix queries, add lp behat test Internal - Add more behat tests, fix php errors. Internal - Add admin icons Internal - Add/Fix behat test

FlintCIBot · 2020-09-24T20:29:36Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/44794

This comment was posted by FlintCI. It can be disabled in the repository settings.

codeclimate

The PR diff size of 5253 lines exceeds the maximum allowed for the inline comments feature.

FlintCIBot · 2020-09-24T21:08:33Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/44795

This comment was posted by FlintCI. It can be disabled in the repository settings.

FlintCIBot · 2020-09-24T21:24:56Z

Lint errors were found. A patch is also available.

Please see the report: https://flintci.io/repositories/1013/analyses/44800

This comment was posted by FlintCI. It can be disabled in the repository settings.

codeclimate

The PR diff size of 5266 lines exceeds the maximum allowed for the inline comments feature.

codeclimate · 2020-09-24T21:47:31Z

Code Climate has analyzed commit 0a0f4dd and detected 134 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Bug Risk	127
Style	7

Note: there are 12 critical issues.

View more on Code Climate.

public/main/gradebook/lib/be/abstractlink.class.php

public/main/exercise/exercise.class.php

public/main/forum/forumfunction.inc.php

public/main/gradebook/lib/be/evaluation.class.php

src/CoreBundle/Entity/GradebookCertificate.php

jmontoyaa · 2020-09-25T09:39:12Z

src/CoreBundle/Entity/User.php

     */
-    protected $pictureUri;
+    protected $userCourseCategorys;


protected $userCourseCategories

en src/CoreBundle/Entity/TrackEAttempt.php no se podría eliminar ya que depende por cursos

/**
* @var Course
* @ApiProperty(iri="http://schema.org/Course") <<<<
* @Orm\ManyToOne(
* targetEntity="Chamilo\CoreBundle\Entity\Course",
* inversedBy="trackEAttempts"
* )

src/CoreBundle/Entity/User.php

jmontoyaa · 2020-09-25T09:50:32Z

Solamente cambiar las llamadas $userId = $obj->getUserId(); por lo nuevo, los ejercicios aún no funcionan en v2 y hay muchas cosas por corregir aún.

jmontoyaa · 2020-09-28T06:49:36Z

Voy ha agregar estos cambios parcialmente a master

jmontoyaa · 2020-09-28T09:52:38Z

He agregado los cambios hechos en src/CoreBundle.
Los cambios hechos a src/CourseBundle no serán pasados, pues esas entidades van ha hacer resources y los resources tienen datos del autor en resourceNode.creator

WIP: Mod on entity user_id to entity model user. Old user_id is comme…

504cfc9

…nted

jmontoyaa requested changes Aug 21, 2020

View reviewed changes

AngelFQC requested changes Sep 1, 2020

View reviewed changes

src/CoreBundle/Entity/UserRelUser.php Outdated Show resolved Hide resolved

src/CoreBundle/Entity/UserRelTag.php Outdated Show resolved Hide resolved

src/CoreBundle/Entity/UserRelCourseVote.php Outdated Show resolved Hide resolved

WIP: System: Refactoring user id to user / ClassUser.php marked as de…

4f8139a

…precated - refs chamilo#3464

System: ApiPlatform to entity's | userId set to deprecated | relUserR…

2e43986

…el to userRelationship - refs chamilo#3464

carlangas159 changed the title ~~WIP: System: Modifying entity with annotations for user_id. the previous one is commented~~ System: Modifying entity with annotations for user_id. the previous one is commented Sep 4, 2020

jmontoyaa reviewed Sep 7, 2020

View reviewed changes

carlangas159 added 2 commits September 7, 2020 10:18

codeclimate bot reviewed Sep 7, 2020

View reviewed changes

System: Added change on CourseBundle for user. Adjust to iri. Changed…

d5f5559

… collectionOperations and itemOperations to get. Removed Duplicate attributes={"security"="is_granted('ROLE_ADMIN')"} from apiResoruce. - refs chamilo#3464

codeclimate bot reviewed Sep 8, 2020

View reviewed changes

System: ApiPlatform removed - refs chamilo#3464

35ff647

codeclimate bot reviewed Sep 9, 2020

View reviewed changes

Merge branch 'master' into EntityUser

f031c76

codeclimate bot reviewed Sep 9, 2020

View reviewed changes

System: psalm fix - refs chamilo#3464

a75c207

codeclimate bot reviewed Sep 9, 2020

View reviewed changes

Minor: System: ecs fix - refs chamilo#3464

2f4dae2

codeclimate bot reviewed Sep 10, 2020

View reviewed changes

jmontoyaa reviewed Sep 11, 2020

View reviewed changes

carlangas159 added 2 commits September 23, 2020 11:24

System: Implement UserTrait. Removed set and get User from entity. - …

cc6c567

…refs chamilo#3464

Minor: Flinci fix - refs chamilo#3464

5908a4e

codeclimate bot reviewed Sep 23, 2020

View reviewed changes

carlangas159 added 2 commits September 24, 2020 15:15

System: Set user by repository - refs chamilo#3464

39f917f

codeclimate bot reviewed Sep 24, 2020

View reviewed changes

Minor: Flinci fix - refs chamilo#3464

fd50dbf

System: getUserId() to getUser()->getId() - refs chamilo#3464

0a0f4dd

codeclimate bot reviewed Sep 24, 2020

View reviewed changes

jmontoyaa requested changes Sep 25, 2020

View reviewed changes

jmontoyaa closed this Sep 30, 2020

		@@ -4,11 +4,25 @@

		namespace Chamilo\CoreBundle\Entity;

		use ApiPlatform\Core\Annotation\ApiFilter;

		@@ -4,11 +4,25 @@

		namespace Chamilo\CoreBundle\Entity;

		use ApiPlatform\Core\Annotation\ApiResource;

		@@ -4,6 +4,7 @@

		namespace Chamilo\CoreBundle\Entity;

		use ApiPlatform\Core\Annotation\ApiProperty;

System: Modifying entity with annotations for user_id. the previous one is commented #3464

System: Modifying entity with annotations for user_id. the previous one is commented #3464

Conversation

carlangas159 commented Aug 20, 2020

FlintCIBot commented Aug 20, 2020

AngelFQC left a comment

Choose a reason for hiding this comment

jmontoyaa commented Sep 2, 2020

FlintCIBot commented Sep 2, 2020

carlangas159 commented Sep 2, 2020 • edited

FlintCIBot commented Sep 2, 2020

FlintCIBot commented Sep 3, 2020

jmontoyaa commented Sep 7, 2020

FlintCIBot commented Sep 7, 2020

codeclimate bot Sep 7, 2020

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2020

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2020

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2020

Choose a reason for hiding this comment

codeclimate bot Sep 7, 2020

Choose a reason for hiding this comment

FlintCIBot commented Sep 8, 2020

carlangas159 commented Sep 8, 2020

codeclimate bot left a comment

Choose a reason for hiding this comment

jmontoyaa commented Sep 9, 2020

FlintCIBot commented Sep 9, 2020

codeclimate bot left a comment

Choose a reason for hiding this comment

FlintCIBot commented Sep 9, 2020

jmontoyaa commented Sep 9, 2020

FlintCIBot commented Sep 9, 2020

codeclimate bot left a comment

Choose a reason for hiding this comment

codeclimate bot left a comment

Choose a reason for hiding this comment

codeclimate bot left a comment

Choose a reason for hiding this comment

jmontoyaa Sep 11, 2020

Choose a reason for hiding this comment

jmontoyaa Sep 25, 2020

Choose a reason for hiding this comment

jmontoyaa commented Sep 11, 2020

jmontoyaa commented Sep 11, 2020

FlintCIBot commented Sep 23, 2020

carlangas159 commented Sep 23, 2020

codeclimate bot left a comment

Choose a reason for hiding this comment

FlintCIBot commented Sep 24, 2020

codeclimate bot left a comment

Choose a reason for hiding this comment

FlintCIBot commented Sep 24, 2020

FlintCIBot commented Sep 24, 2020

codeclimate bot left a comment

Choose a reason for hiding this comment

codeclimate bot commented Sep 24, 2020

jmontoyaa Sep 25, 2020

Choose a reason for hiding this comment

carlangas159 Sep 25, 2020

Choose a reason for hiding this comment

jmontoyaa commented Sep 25, 2020

jmontoyaa commented Sep 28, 2020

jmontoyaa commented Sep 28, 2020

carlangas159 commented Sep 2, 2020 •

edited