[IMP] refactor odoo step is_model

Author: mmahrouss

server/src/core/python_odoo_builder.rs

@@ -44,7 +44,7 @@ impl PythonOdooBuilder {
         if sym.borrow().typ() != SymType::CLASS {
             return diagnostics;
         }
-        if !self.test_symbol_is_model(session, &mut diagnostics) {
+        if !self.is_symbol_model(session, &mut diagnostics) {
             return diagnostics;
         }
         self._load_class_inherit(session, &mut diagnostics);
@@ -352,36 +352,10 @@ impl PythonOdooBuilder {
     }
 
     /* true if the symbol inherits from BaseModel, Model, TransientModel, or CachedModel. symbol must be the data of rc_symbol and must be a Class */
-    fn test_symbol_is_model(&mut self, session: &mut SessionInfo, diagnostics: &mut Vec<Diagnostic>) -> bool {
+    fn is_symbol_model(&mut self, session: &mut SessionInfo, diagnostics: &mut Vec<Diagnostic>) -> bool {
         let symbol = &self.symbol.clone();
-        let odoo_symbol_tree = symbol.borrow().get_main_entry_tree(session);
-        let mut sym = symbol.borrow_mut();
-        if [&[Sy!("BaseModel")], &[Sy!("Model")], &[Sy!("TransientModel")]].iter().any(|x| x == &odoo_symbol_tree.1.as_slice()) &&
-            // [BaseModel|Model|TransientModel]
-            (( // < 18.1, and we are on odoo.models.
-                compare_semver(session.sync_odoo.full_version.as_str(), "18.1") == Ordering::Less
-                && odoo_symbol_tree.0 == &["odoo", "models"]
-            ) || ( // >= 18.1, and we are on odoo.orm.models.
-                compare_semver(session.sync_odoo.full_version.as_str(), "18.1") >= Ordering::Equal
-                && odoo_symbol_tree.0 == &["odoo", "orm", "models"]
-            ))
-            // >= 18.3, and we are on odoo.orm.models_transient.TransientModel
-            || (
-                compare_semver(session.sync_odoo.full_version.as_str(), "18.3") >= Ordering::Equal
-                && odoo_symbol_tree.1 == &["TransientModel"]
-                && odoo_symbol_tree.0 == &["odoo", "orm", "models_transient"]
-            )
-            // we are on odoo.orm.models_cached.CachedModel
-            || (
-                compare_semver(session.sync_odoo.full_version.as_str(), "19.1") >= Ordering::Equal
-                && odoo_symbol_tree.1 == &["CachedModel"]
-                && odoo_symbol_tree.0 == &["odoo", "orm", "models_cached"]
-            )
-        {
-            //we don't want to compare these classes with themselves, so we exit early
-            return false;
-        }
-        if sym.as_class_sym().bases.is_empty() {
+        // let sym = symbol.borrow();
+        if symbol.borrow().as_class_sym().bases.is_empty() {
             return false;
         }
         let mut base_model_tree = (vec![Sy!("odoo"), Sy!("models")], vec![Sy!("BaseModel")]);
@@ -405,41 +379,37 @@ impl PythonOdooBuilder {
         // Check if the symbol is exactly BaseModel, Model or TransientModel
         // BaseModel, Model, or TransientModel are abstract base classes, we don't want to mark them as models
         if Rc::ptr_eq(symbol, &base_model_syms[0])
-        || model_syms.first().is_some_and(|s| Rc::ptr_eq(symbol, s))
-        || transient_syms.first().is_some_and(|s| Rc::ptr_eq(symbol, s))
+        || model_syms.iter().any(|s| Rc::ptr_eq(symbol, s))
+        || transient_syms.iter().any(|s| Rc::ptr_eq(symbol, s))
         {
             return false;
         }
         if compare_semver(session.sync_odoo.full_version.as_str(), "19.1") >= Ordering::Equal{
             let cached_model_tree = (vec![Sy!("odoo"), Sy!("orm"), Sy!("models_cached")], vec![Sy!("CachedModel")]);
             let cached_model_syms = session.sync_odoo.get_symbol(session.sync_odoo.config.odoo_path.as_ref().unwrap(), &cached_model_tree, u32::MAX);
-            if cached_model_syms.first().is_some_and(|s| Rc::ptr_eq(symbol, s)){
+            if cached_model_syms.iter().any(|s| Rc::ptr_eq(symbol, s)){
                 return false;
             }
 
         }
-        if !sym.as_class_sym().inherits(&base_model_syms[0], &mut None) {
+        if !symbol.borrow().as_class_sym().inherits(&base_model_syms[0], &mut None) {
             return false;
         }
+        let mut sym = symbol.borrow_mut();
         sym.as_class_sym_mut()._model = Some(ModelData::new());
         // Check if we have a _register = False
         let register = sym.get_symbol(&(vec![], vec![Sy!("_register")]), u32::MAX);
         if let Some(register) = register.last() {
             let loc_register = register.borrow();
-            let register_evals = &loc_register.evaluations().unwrap();
+            let register_evals = loc_register.evaluations().unwrap();
             if register_evals.len() == 1 { //we don't handle multiple values
-                let eval = &register_evals[0];
-                let value = eval.follow_ref_and_get_value(session, &mut None, diagnostics);
-                if value.is_some() {
-                    let value = value.unwrap();
-                    if let EvaluationValue::CONSTANT(Expr::BooleanLiteral(b)) = value {
-                        if !b.value {
-                            return false;
-                        }
+                let maybe_value = register_evals[0].follow_ref_and_get_value(session, &mut None, diagnostics);
+                if let Some(EvaluationValue::CONSTANT(Expr::BooleanLiteral(b))) = maybe_value {
+                    if !b.value {
+                        return false;
                     }
                 }
             }
-            return true;
         }
         true
     }